Enable String, URL and XML-related types for WASI

fix

Author: MaxDesiatov

Sources/Foundation/NSString.swift

@@ -25,7 +25,11 @@ func NSLocalizedString(_ key: String,
                        bundle: Bundle = Bundle.main,
                        value: String = "",
                        comment: String) -> String {
+#if os(WASI)
+    return key
+#else
     return bundle.localizedString(forKey: key, value: value, table: tableName)
+#endif
 }
 
 internal let kCFStringEncodingMacRoman =  CFStringBuiltInEncodings.macRoman.rawValue
@@ -237,7 +241,7 @@ open class NSString : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSC
     internal init(_ string: String) {
         _storage = string
     }
-    
+
     public convenience required init?(coder aDecoder: NSCoder) {
         guard aDecoder.allowsKeyedCoding else {
             preconditionFailure("Unkeyed coding is unsupported.")
@@ -292,11 +296,11 @@ open class NSString : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSC
         characters.deallocate()
         return result
     }
-    
+
     public static var supportsSecureCoding: Bool {
         return true
     }
-    
+
     open func encode(with aCoder: NSCoder) {
         if let aKeyedCoder = aCoder as? NSKeyedArchiver {
             aKeyedCoder._encodePropertyList(self, forKey: "NS.string")
@@ -1267,7 +1271,7 @@ extension NSString {
         }
         data = mData
     }
-    
+
     internal func _writeTo(_ url: URL, _ useAuxiliaryFile: Bool, _ enc: UInt) throws {
         var data = Data()
         try _getExternalRepresentation(&data, url, enc)

Sources/Foundation/NSSwiftRuntime.swift

@@ -16,11 +16,15 @@
 @_exported import Darwin
 #elseif os(Linux) || os(Android) || CYGWIN || os(OpenBSD)
 @_exported import Glibc
+#elseif os(WASI)
+@_exported import WASILibc
 #elseif os(Windows)
 @_exported import CRT
 #endif
 
+#if !os(WASI)
 @_exported import Dispatch
+#endif
 
 #if os(Windows)
 import WinSDK
@@ -257,8 +261,10 @@ internal func __CFInitializeSwift() {
     __CFSwiftBridge.NSMutableString.appendString = _CFSwiftStringAppend
     __CFSwiftBridge.NSMutableString.appendCharacters = _CFSwiftStringAppendCharacters
     __CFSwiftBridge.NSMutableString._cfAppendCString = _CFSwiftStringAppendCString
-    
+
+#if !os(WASI)    
     __CFSwiftBridge.NSRunLoop._new = _NSRunLoopNew
+#endif
 
     __CFSwiftBridge.NSCharacterSet._expandedCFCharacterSet = _CFSwiftCharacterSetExpandedCFCharacterSet
     __CFSwiftBridge.NSCharacterSet._retainedBitmapRepresentation = _CFSwiftCharacterSetRetainedBitmapRepresentation
@@ -304,6 +310,7 @@ internal func __CFInitializeSwift() {
 
 //    __CFDefaultEightBitStringEncoding = UInt32(kCFStringEncodingUTF8)
 
+#if !os(WASI)
     __CFSwiftBridge.NSURL.copyResourcePropertyForKey = _CFSwiftURLCopyResourcePropertyForKey
     __CFSwiftBridge.NSURL.copyResourcePropertiesForKeys = _CFSwiftURLCopyResourcePropertiesForKeys
     __CFSwiftBridge.NSURL.setResourcePropertyForKey = _CFSwiftURLSetResourcePropertyForKey
@@ -312,6 +319,7 @@ internal func __CFInitializeSwift() {
     __CFSwiftBridge.NSURL.clearResourcePropertyCache = _CFSwiftURLClearResourcePropertyCache
     __CFSwiftBridge.NSURL.setTemporaryResourceValueForKey = _CFSwiftSetTemporaryResourceValueForKey
     __CFSwiftBridge.NSURL.resourceIsReachable = _CFSwiftURLResourceIsReachable
+#endif
 }
 
 public func === (lhs: AnyClass, rhs: AnyClass) -> Bool {

Sources/Foundation/NSTextCheckingResult.swift

@@ -53,7 +53,7 @@ open class NSTextCheckingResult: NSObject, NSCopying, NSSecureCoding {
     open class var supportsSecureCoding: Bool {
         NSRequiresConcreteImplementation()
     }
-    
+
     open override func copy() -> Any {
         return copy(with: nil)
     }
@@ -115,7 +115,7 @@ internal class NSRegularExpressionCheckingResult: NSTextCheckingResult {
         _rangeArray = nil
         super.init()
     }
-    
+
     public convenience required init?(coder aDecoder: NSCoder) {
         guard aDecoder.allowsKeyedCoding else {
             fatalError("Decoding this class requires keyed coding")

Sources/Foundation/NSTimeZone.swift

@@ -39,7 +39,7 @@ open class NSTimeZone : NSObject, NSCopying, NSSecureCoding, NSCoding {
             return nil
         }
     }
-    
+
     public convenience required init?(coder aDecoder: NSCoder) {
         guard aDecoder.allowsKeyedCoding else {
             preconditionFailure("Unkeyed coding is unsupported.")
@@ -53,7 +53,7 @@ open class NSTimeZone : NSObject, NSCopying, NSSecureCoding, NSCoding {
 
         self.init(name: String._unconditionallyBridgeFromObjectiveC(name), data: data?._swiftObject)
     }
-    
+
     open override var hash: Int {
         return Int(bitPattern: CFHash(_cfObject))
     }
@@ -112,7 +112,7 @@ open class NSTimeZone : NSObject, NSCopying, NSSecureCoding, NSCoding {
         // Darwin versions of this method can and will encode mutable data, however it is not required for compatibility
         aCoder.encode(self.data._bridgeToObjectiveC(), forKey:"NS.data")
     }
-    
+
     public static var supportsSecureCoding: Bool {
         return true
     }
@@ -296,7 +296,7 @@ internal class __NSLocalTimeZone: NSTimeZone {
     private init() {
         super.init(_name: "GMT+0000")
     }
-    
+
     public convenience required init?(coder aDecoder: NSCoder) {
         // We do not encode details of the local time zone, merely the placeholder object.
         self.init()
@@ -305,7 +305,7 @@ internal class __NSLocalTimeZone: NSTimeZone {
     override func encode(with aCoder: NSCoder) {
         // We do not encode details of the local time zone, merely the placeholder object.
     }
-    
+
     private var system: NSTimeZone {
         return NSTimeZone.system._nsObject
     }

Sources/Foundation/NSURL.swift

@@ -153,6 +153,7 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying {
     open func copy(with zone: NSZone? = nil) -> Any {
         if isFileURL {
             let newURL = CFURLCreateWithString(kCFAllocatorSystemDefault, relativeString._cfObject, self.baseURL?._cfObject)!
+
             if let storage = _resourceStorageIfPresent {
                 let newStorage = URLResourceValuesStorage(copying: storage)
                 _CFURLSetResourceInfo(newURL, newStorage)
@@ -186,7 +187,7 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying {
         aCoder.encode(self.baseURL?._nsObject, forKey:"NS.base")
         aCoder.encode(self.relativeString._bridgeToObjectiveC(), forKey:"NS.relative")
     }
-    
+
     public init(fileURLWithPath path: String, isDirectory isDir: Bool, relativeTo baseURL: URL?) {
         super.init()
 
@@ -198,14 +199,15 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying {
             _CFURLInitWithFileSystemPathRelativeToBase(_cfObject, baseURL.path._cfObject, kCFURLPlatformPathStyle, baseURL.hasDirectoryPath, nil)
         }
     }
-    
+
     public convenience init(fileURLWithPath path: String, relativeTo baseURL: URL?) {
         let thePath = _standardizedPath(path)
 
         var isDir: ObjCBool = false
         if validPathSeps.contains(where: { thePath.hasSuffix(String($0)) }) {
             isDir = true
         } else {
+#if !os(WASI)
             let absolutePath: String
             if let absPath = baseURL?.appendingPathComponent(path).path {
                 absolutePath = absPath
@@ -214,6 +216,7 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying {
             }
 
             let _ = FileManager.default.fileExists(atPath: absolutePath, isDirectory: &isDir)
+#endif
         }
 
         self.init(fileURLWithPath: thePath, isDirectory: isDir.boolValue, relativeTo: baseURL)
@@ -230,9 +233,11 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying {
         if validPathSeps.contains(where: { thePath.hasSuffix(String($0)) }) {
             isDir = true
         } else {
+#if !os(WASI)
             if !FileManager.default.fileExists(atPath: path, isDirectory: &isDir) {
                 isDir = false
             }
+#endif
         }
         super.init()
         _CFURLInitWithFileSystemPathRelativeToBase(_cfObject, thePath._cfObject, kCFURLPlatformPathStyle, isDir.boolValue, nil)
@@ -243,7 +248,7 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying {
         let pathString = String(cString: path)
         self.init(fileURLWithPath: pathString, isDirectory: isDir, relativeTo: baseURL)
     }
-    
+
     public convenience init?(string URLString: String) {
         self.init(string: URLString, relativeTo:nil)
     }
@@ -542,6 +547,9 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying {
     // TODO: should be `checkResourceIsReachableAndReturnError` with autoreleased error parameter.
     // Currently Autoreleased pointers is not supported on Linux.
     open func checkResourceIsReachable() throws -> Bool {
+#if os(WASI)
+        return false
+#else
         guard isFileURL,
             let path = path else {
                 throw NSError(domain: NSCocoaErrorDomain,
@@ -557,6 +565,7 @@ open class NSURL : NSObject, NSSecureCoding, NSCopying {
         }
 
         return true
+#endif
     }
 
     /* Returns a file path URL that refers to the same resource as a specified URL. File path URLs use a file system style path. An error will occur if the url parameter is not a file URL. A file reference URL's resource must exist and be reachable to be converted to a file path URL. Symbol is present in iOS 4, but performs no operation.
@@ -760,7 +769,7 @@ extension NSString {
 }
 
 extension NSURL {
-    
+
     /* The following methods work on the path portion of a URL in the same manner that the NSPathUtilities methods on NSString do.
     */
     open class func fileURL(withPathComponents components: [String]) -> URL? {
@@ -841,6 +850,9 @@ extension NSURL {
 
     open func appendingPathComponent(_ pathComponent: String) -> URL? {
         var result : URL? = appendingPathComponent(pathComponent, isDirectory: false)
+
+        // File URLs can't be handled on WASI without file system access
+        #if !os(WASI)
         // Since we are appending to a URL, path seperators should
         // always be '/', even if we're on Windows
         if !pathComponent.hasSuffix("/") && isFileURL {
@@ -852,6 +864,7 @@ extension NSURL {
             }
 
         }
+        #endif
         return result
     }
 
@@ -870,15 +883,15 @@ extension NSURL {
     open var deletingPathExtension: URL? {
         return CFURLCreateCopyDeletingPathExtension(kCFAllocatorSystemDefault, _cfObject)?._swiftObject
     }
-    
+
     /* The following methods work only on `file:` scheme URLs; for non-`file:` scheme URLs, these methods return the URL unchanged.
     */
     open var standardizingPath: URL? {
         // Documentation says it should expand initial tilde, but it does't do this on OS X.
         // In remaining cases it works just like URLByResolvingSymlinksInPath.
         return _resolveSymlinksInPath(excludeSystemDirs: true, preserveDirectoryFlag: true)
     }
-    
+
     open var resolvingSymlinksInPath: URL? {
         return _resolveSymlinksInPath(excludeSystemDirs: true)
     }
@@ -896,8 +909,12 @@ extension NSURL {
         if selfPath.isAbsolutePath {
             absolutePath = selfPath
         } else {
+#if os(WASI)
+            return nil
+#else
             let workingDir = FileManager.default.currentDirectoryPath
             absolutePath = workingDir._bridgeToObjectiveC().appendingPathComponent(selfPath)
+#endif
         }
 
 
@@ -918,15 +935,20 @@ extension NSURL {
 
             default:
                 resolvedPath = resolvedPath._bridgeToObjectiveC().appendingPathComponent(component)
+#if !os(WASI)
                 if let destination = FileManager.default._tryToResolveTrailingSymlinkInPath(resolvedPath) {
                     resolvedPath = destination
                 }
+#endif
             }
         }
 
         // It might be a responsibility of NSURL(fileURLWithPath:). Check it.
         var isExistingDirectory: ObjCBool = false
+
+#if !os(WASI)
         let _ = FileManager.default.fileExists(atPath: resolvedPath, isDirectory: &isExistingDirectory)
+#endif
 
         if excludeSystemDirs {
             resolvedPath = resolvedPath._tryToRemovePathPrefix("/private") ?? resolvedPath
@@ -1005,6 +1027,7 @@ extension NSURL : _StructTypeBridgeable {
 
 // -----
 
+#if !os(WASI)
 internal func _CFSwiftURLCopyResourcePropertyForKey(_ url: CFTypeRef, _ key: CFString, _ valuePointer: UnsafeMutablePointer<Unmanaged<CFTypeRef>?>?, _ errorPointer: UnsafeMutablePointer<Unmanaged<CFError>?>?) -> _DarwinCompatibleBoolean {
     do {
         let key = URLResourceKey(rawValue: key._swiftObject)
@@ -1538,6 +1561,7 @@ fileprivate extension URLResourceValuesStorage {
         }
     }
 }
+#endif
 
 // -----
 

Sources/Foundation/PropertyListSerialization.swift

@@ -74,6 +74,7 @@ open class PropertyListSerialization : NSObject {
         }
     }
 
+    #if !os(WASI)
     internal class func propertyList(with stream: CFReadStream, options opt: ReadOptions, format: UnsafeMutablePointer <PropertyListFormat>?) throws -> Any {
         var fmt = kCFPropertyListBinaryFormat_v1_0
         var error: Unmanaged<CFError>? = nil
@@ -93,4 +94,5 @@ open class PropertyListSerialization : NSObject {
     open class func propertyList(with stream: InputStream, options opt: ReadOptions = [], format: UnsafeMutablePointer<PropertyListFormat>?) throws -> Any {
         return try propertyList(with: stream._stream, options: opt, format: format)
     }
+    #endif
 }

Sources/Foundation/URL.swift

@@ -504,7 +504,7 @@ public struct URL : ReferenceConvertible, Equatable {
         guard !string.isEmpty, let inner = NSURL(string: string, relativeTo: url) else { return nil }
         _url = URL._converted(from: inner)
     }
-    
+
     /// Initializes a newly created file URL referencing the local file or directory at path, relative to a base URL.
     ///
     /// If an empty string is used for the path, then the path is assumed to be ".".
@@ -1054,7 +1054,6 @@ extension URL : Codable {
     }
 }
 
-
 //===----------------------------------------------------------------------===//
 // File references, for playgrounds.
 //===----------------------------------------------------------------------===//