Смена null на Неопределено в входных и возвращаемых значениях методов

akpaevj · akpaevj · commit 320db59320fd · 2024-12-10T20:54:22.000+03:00
diff --git a/src/OneScript.Web.Server/CookieOptionsWrapper.cs b/src/OneScript.Web.Server/CookieOptionsWrapper.cs
@@ -24,13 +24,13 @@ public IValue Domain
             get
             {
                 if (_cookieOptions.Domain == null)
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
                 else
                     return BslStringValue.Create(_cookieOptions.Domain);
             }
             set
             {
-                if (value is BslNullValue)
+                if (value is BslUndefinedValue)
                     _cookieOptions.Domain = null;
                 else
                     _cookieOptions.Domain = value.AsString();
@@ -40,10 +40,10 @@ public IValue Domain
         [ContextProperty("Путь", "Path")]
         public IValue Path
         {
-            get => _cookieOptions.Path == null ? BslNullValue.Instance : BslStringValue.Create(_cookieOptions.Path);
+            get => _cookieOptions.Path == null ? BslUndefinedValue.Instance : BslStringValue.Create(_cookieOptions.Path);
             set
             {
-                if (value is BslNullValue)
+                if (value is BslUndefinedValue)
                     _cookieOptions.Path = null;
                 else
                     _cookieOptions.Path = value.AsString();
@@ -58,11 +58,11 @@ public IValue Expires
                 if (_cookieOptions.Expires.HasValue)
                     return BslDateValue.Create(_cookieOptions.Expires.Value.UtcDateTime);
                 else
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
             }
             set
             {
-                if (value is BslNullValue)
+                if (value is BslUndefinedValue)
                     _cookieOptions.Expires = null;
                 else
                     _cookieOptions.Expires = new DateTimeOffset(value.AsDate());
@@ -98,11 +98,11 @@ public IValue MaxAge
                 if (_cookieOptions.MaxAge.HasValue)
                     return BslNumericValue.Create((decimal)_cookieOptions.MaxAge.Value.TotalSeconds);
                 else
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
             }
             set
             {
-                if (value is BslNullValue)
+                if (value is BslUndefinedValue)
                     _cookieOptions.MaxAge = null;
                 else
                     _cookieOptions.MaxAge = TimeSpan.FromSeconds((double)value.AsNumber());
diff --git a/src/OneScript.Web.Server/FormCollectionWrapper.cs b/src/OneScript.Web.Server/FormCollectionWrapper.cs
@@ -49,7 +49,7 @@ public IEnumerable<IValue> Keys()
         #region ICollectionContext Members
 
         [ContextMethod("Получить", "Get")]
-        public StringValuesWrapper Retrieve(IValue key)
+        public StringValuesWrapper Get(IValue key)
         {
             return GetIndexedValue(key);
         }
diff --git a/src/OneScript.Web.Server/FormFileCollectionWrapper.cs b/src/OneScript.Web.Server/FormFileCollectionWrapper.cs
@@ -31,7 +31,7 @@ public override IValue GetIndexedValue(IValue index)
             var result = _items.GetFile(index.AsString());
 
             if (result == null)
-                return BslNullValue.Instance;
+                return BslUndefinedValue.Instance;
             else
                 return new FormFileWrapper(result);
         }
diff --git a/src/OneScript.Web.Server/HttpRequestWrapper.cs b/src/OneScript.Web.Server/HttpRequestWrapper.cs
@@ -49,7 +49,7 @@ public IValue ContentType
             get
             {
                 if (_request.ContentType == null)
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
                 else
                     return BslStringValue.Create(_request.ContentType);
             }
@@ -61,7 +61,7 @@ public IValue ContentLength
             get
             {
                 if (_request.ContentLength == null)
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
                 else
                     return BslNumericValue.Create((decimal)_request.ContentLength);
             }
@@ -84,7 +84,7 @@ public IValue QueryString
                 if (_request.QueryString.HasValue)
                     return BslStringValue.Create(_request.QueryString.Value);
                 else
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
             }
         }
 
@@ -96,7 +96,7 @@ public IValue Path
                 if (_request.Path.HasValue)
                     return BslStringValue.Create(_request.Path.Value);
                 else
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
             }
         }
 
@@ -108,7 +108,7 @@ public IValue PathBase
                 if (_request.PathBase.HasValue)
                     return BslStringValue.Create(_request.PathBase);
                 else
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
             }
         }
 
@@ -120,7 +120,7 @@ public IValue Host
                 if (_request.Host.HasValue)
                     return BslStringValue.Create(_request.Host.Value);
                 else
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
             }
         }
 
@@ -141,7 +141,7 @@ public IValue Form
                 if (_request.HasFormContentType)
                     return new FormCollectionWrapper(_request.Form);
                 else
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
             }
         }
     }
diff --git a/src/OneScript.Web.Server/HttpResponseWrapper.cs b/src/OneScript.Web.Server/HttpResponseWrapper.cs
@@ -46,7 +46,7 @@ public IValue ContentLength
             get
             {
                 if (_response.ContentLength == null)
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
                 else
                     return BslNumericValue.Create((decimal)_response.ContentLength);
             }
diff --git a/src/OneScript.Web.Server/WebSockets/WebSocketAcceptContextWrapper.cs b/src/OneScript.Web.Server/WebSockets/WebSocketAcceptContextWrapper.cs
@@ -29,11 +29,11 @@ public IValue Protocol
         {
             get
             {
-                return _context.SubProtocol == null ? BslNullValue.Instance : BslStringValue.Create(_context.SubProtocol);
+                return _context.SubProtocol == null ? BslUndefinedValue.Instance : BslStringValue.Create(_context.SubProtocol);
             }
             set
             {
-                _context.SubProtocol = value is BslNullValue ? null : value.AsString();
+                _context.SubProtocol = value is BslUndefinedValue ? null : value.AsString();
             }
         }
 
@@ -48,11 +48,11 @@ public IValue KeepAlive
                 if (_context.KeepAliveInterval.HasValue)
                     return BslNumericValue.Create((decimal)_context.KeepAliveInterval.Value.TotalSeconds);
                 else
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
             }
             set
             {
-                if (value is BslNullValue)
+                if (value is BslUndefinedValue)
                     _context.KeepAliveInterval = null;
                 else
                     _context.KeepAliveInterval = TimeSpan.FromSeconds((double)value.AsNumber());
diff --git a/src/OneScript.Web.Server/WebSockets/WebSocketReceiveResultWrapper.cs b/src/OneScript.Web.Server/WebSockets/WebSocketReceiveResultWrapper.cs
@@ -40,7 +40,7 @@ public IValue CloseStatusDescription
             get
             {
                 if (_result.CloseStatusDescription == null)
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
                 else
                     return BslStringValue.Create(_result.CloseStatusDescription);
             }
diff --git a/src/OneScript.Web.Server/WebSockets/WebSocketWrapper.cs b/src/OneScript.Web.Server/WebSockets/WebSocketWrapper.cs
@@ -43,7 +43,7 @@ public IValue CloseStatusDescription
             get
             {
                 if (_webSocket.CloseStatusDescription == null)
-                    return BslNullValue.Instance;
+                    return BslUndefinedValue.Instance;
                 else
                     return BslStringValue.Create(_webSocket.CloseStatusDescription);
             }
@@ -60,7 +60,7 @@ public IValue CloseStatusDescription
         /// </summary>
         [ContextProperty("Протокол", "Protocol", CanWrite = false)]
         public IValue Protocol
-            => _webSocket.SubProtocol == null ? BslNullValue.Instance : (IValue)BslStringValue.Create(_webSocket.SubProtocol);
+            => _webSocket.SubProtocol == null ? BslUndefinedValue.Instance : BslStringValue.Create(_webSocket.SubProtocol);
 
         /// <summary>
         /// Отменяет соединение WebSocket и отменяет все ожидающие операции ввода-вывода
@@ -76,7 +76,7 @@ public IValue Protocol
         [ContextMethod("Закрыть", "Close")]
         public void Close(WebSocketCloseStatusWrapper status, IValue statusDescription)
         {
-            var desc = statusDescription is BslNullValue ? null : statusDescription.AsString();
+            var desc = statusDescription is BslUndefinedValue ? null : statusDescription.AsString();
 
             _webSocket.CloseAsync((WebSocketCloseStatus)status, desc, default).Wait();
         }
@@ -89,7 +89,7 @@ public void Close(WebSocketCloseStatusWrapper status, IValue statusDescription)
         [ContextMethod("ЗакрытьВыходнойПоток", "CloseOutput")]
         public void CloseOutput(WebSocketCloseStatusWrapper status, IValue statusDescription)
         {
-            var desc = statusDescription is BslNullValue ? null : statusDescription.AsString();
+            var desc = statusDescription is BslUndefinedValue ? null : statusDescription.AsString();
 
             _webSocket.CloseOutputAsync((WebSocketCloseStatus)status, desc, default).Wait();
         }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public IEnumerable<IValue> Keys()`
`49`	`49`	`#region ICollectionContext Members`
`50`	`50`
`51`	`51`	`[ContextMethod("Получить", "Get")]`
`52`		`- public StringValuesWrapper Retrieve(IValue key)`
	`52`	`+ public StringValuesWrapper Get(IValue key)`
`53`	`53`	`{`
`54`	`54`	`return GetIndexedValue(key);`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public override IValue GetIndexedValue(IValue index)`
`31`	`31`	`var result = _items.GetFile(index.AsString());`
`32`	`32`
`33`	`33`	`if (result == null)`
`34`		`- return BslNullValue.Instance;`
	`34`	`+ return BslUndefinedValue.Instance;`
`35`	`35`	`else`
`36`	`36`	`return new FormFileWrapper(result);`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public IValue ContentType`
`49`	`49`	`get`
`50`	`50`	`{`
`51`	`51`	`if (_request.ContentType == null)`
`52`		`- return BslNullValue.Instance;`
	`52`	`+ return BslUndefinedValue.Instance;`
`53`	`53`	`else`
`54`	`54`	`return BslStringValue.Create(_request.ContentType);`
`55`	`55`	`}`
`@@ -61,7 +61,7 @@ public IValue ContentLength`
`61`	`61`	`get`
`62`	`62`	`{`
`63`	`63`	`if (_request.ContentLength == null)`
`64`		`- return BslNullValue.Instance;`
	`64`	`+ return BslUndefinedValue.Instance;`
`65`	`65`	`else`
`66`	`66`	`return BslNumericValue.Create((decimal)_request.ContentLength);`
`67`	`67`	`}`
`@@ -84,7 +84,7 @@ public IValue QueryString`
`84`	`84`	`if (_request.QueryString.HasValue)`
`85`	`85`	`return BslStringValue.Create(_request.QueryString.Value);`
`86`	`86`	`else`
`87`		`- return BslNullValue.Instance;`
	`87`	`+ return BslUndefinedValue.Instance;`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`@@ -96,7 +96,7 @@ public IValue Path`
`96`	`96`	`if (_request.Path.HasValue)`
`97`	`97`	`return BslStringValue.Create(_request.Path.Value);`
`98`	`98`	`else`
`99`		`- return BslNullValue.Instance;`
	`99`	`+ return BslUndefinedValue.Instance;`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`@@ -108,7 +108,7 @@ public IValue PathBase`
`108`	`108`	`if (_request.PathBase.HasValue)`
`109`	`109`	`return BslStringValue.Create(_request.PathBase);`
`110`	`110`	`else`
`111`		`- return BslNullValue.Instance;`
	`111`	`+ return BslUndefinedValue.Instance;`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`@@ -120,7 +120,7 @@ public IValue Host`
`120`	`120`	`if (_request.Host.HasValue)`
`121`	`121`	`return BslStringValue.Create(_request.Host.Value);`
`122`	`122`	`else`
`123`		`- return BslNullValue.Instance;`
	`123`	`+ return BslUndefinedValue.Instance;`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
`@@ -141,7 +141,7 @@ public IValue Form`
`141`	`141`	`if (_request.HasFormContentType)`
`142`	`142`	`return new FormCollectionWrapper(_request.Form);`
`143`	`143`	`else`
`144`		`- return BslNullValue.Instance;`
	`144`	`+ return BslUndefinedValue.Instance;`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public IValue ContentLength`
`46`	`46`	`get`
`47`	`47`	`{`
`48`	`48`	`if (_response.ContentLength == null)`
`49`		`- return BslNullValue.Instance;`
	`49`	`+ return BslUndefinedValue.Instance;`
`50`	`50`	`else`
`51`	`51`	`return BslNumericValue.Create((decimal)_response.ContentLength);`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ public IValue Protocol`
`29`	`29`	`{`
`30`	`30`	`get`
`31`	`31`	`{`
`32`		`- return _context.SubProtocol == null ? BslNullValue.Instance : BslStringValue.Create(_context.SubProtocol);`
	`32`	`+ return _context.SubProtocol == null ? BslUndefinedValue.Instance : BslStringValue.Create(_context.SubProtocol);`
`33`	`33`	`}`
`34`	`34`	`set`
`35`	`35`	`{`
`36`		`- _context.SubProtocol = value is BslNullValue ? null : value.AsString();`
	`36`	`+ _context.SubProtocol = value is BslUndefinedValue ? null : value.AsString();`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`@@ -48,11 +48,11 @@ public IValue KeepAlive`
`48`	`48`	`if (_context.KeepAliveInterval.HasValue)`
`49`	`49`	`return BslNumericValue.Create((decimal)_context.KeepAliveInterval.Value.TotalSeconds);`
`50`	`50`	`else`
`51`		`- return BslNullValue.Instance;`
	`51`	`+ return BslUndefinedValue.Instance;`
`52`	`52`	`}`
`53`	`53`	`set`
`54`	`54`	`{`
`55`		`- if (value is BslNullValue)`
	`55`	`+ if (value is BslUndefinedValue)`
`56`	`56`	`_context.KeepAliveInterval = null;`
`57`	`57`	`else`
`58`	`58`	`_context.KeepAliveInterval = TimeSpan.FromSeconds((double)value.AsNumber());`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public IValue CloseStatusDescription`
`40`	`40`	`get`
`41`	`41`	`{`
`42`	`42`	`if (_result.CloseStatusDescription == null)`
`43`		`- return BslNullValue.Instance;`
	`43`	`+ return BslUndefinedValue.Instance;`
`44`	`44`	`else`
`45`	`45`	`return BslStringValue.Create(_result.CloseStatusDescription);`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public IValue CloseStatusDescription`
`43`	`43`	`get`
`44`	`44`	`{`
`45`	`45`	`if (_webSocket.CloseStatusDescription == null)`
`46`		`- return BslNullValue.Instance;`
	`46`	`+ return BslUndefinedValue.Instance;`
`47`	`47`	`else`
`48`	`48`	`return BslStringValue.Create(_webSocket.CloseStatusDescription);`
`49`	`49`	`}`
`@@ -60,7 +60,7 @@ public IValue CloseStatusDescription`
`60`	`60`	`/// </summary>`
`61`	`61`	`[ContextProperty("Протокол", "Protocol", CanWrite = false)]`
`62`	`62`	`public IValue Protocol`
`63`		`- => _webSocket.SubProtocol == null ? BslNullValue.Instance : (IValue)BslStringValue.Create(_webSocket.SubProtocol);`
	`63`	`+ => _webSocket.SubProtocol == null ? BslUndefinedValue.Instance : BslStringValue.Create(_webSocket.SubProtocol);`
`64`	`64`
`65`	`65`	`/// <summary>`
`66`	`66`	`/// Отменяет соединение WebSocket и отменяет все ожидающие операции ввода-вывода`
`@@ -76,7 +76,7 @@ public IValue Protocol`
`76`	`76`	`[ContextMethod("Закрыть", "Close")]`
`77`	`77`	`public void Close(WebSocketCloseStatusWrapper status, IValue statusDescription)`
`78`	`78`	`{`
`79`		`- var desc = statusDescription is BslNullValue ? null : statusDescription.AsString();`
	`79`	`+ var desc = statusDescription is BslUndefinedValue ? null : statusDescription.AsString();`
`80`	`80`
`81`	`81`	`_webSocket.CloseAsync((WebSocketCloseStatus)status, desc, default).Wait();`
`82`	`82`	`}`
`@@ -89,7 +89,7 @@ public void Close(WebSocketCloseStatusWrapper status, IValue statusDescription)`
`89`	`89`	`[ContextMethod("ЗакрытьВыходнойПоток", "CloseOutput")]`
`90`	`90`	`public void CloseOutput(WebSocketCloseStatusWrapper status, IValue statusDescription)`
`91`	`91`	`{`
`92`		`- var desc = statusDescription is BslNullValue ? null : statusDescription.AsString();`
	`92`	`+ var desc = statusDescription is BslUndefinedValue ? null : statusDescription.AsString();`
`93`	`93`
`94`	`94`	`_webSocket.CloseOutputAsync((WebSocketCloseStatus)status, desc, default).Wait();`
`95`	`95`	`}`