Update project settings for Xcode 12.5

Fixed error with operator precedence in Xcode 12

. codecov.yml

@@ -0,0 +1,5 @@
+codecov:
+  branch: develop
+
+ignore:
+  - "Tests/"

.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: HTMLKit CI
+
+on: [push]
+
+jobs:
+  macOS:
+    name: Test macOS 
+    runs-on: macOS-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: macOS
+        run: xcodebuild -workspace "HTMLKit.xcworkspace" -scheme "HTMLKit-macOS" -destination "platform=macOS" -enableCodeCoverage YES clean test | xcpretty
+      - name: code coverage
+        uses: codecov/codecov-action@v1
+  iOS:
+    name: Test iOS 
+    runs-on: macOS-latest
+    env: 
+      DEVELOPER_DIR: /Applications/Xcode_11.5.app/Contents/Developer
+    strategy:
+      matrix:
+        destination: ["OS=13.5,name=iPhone 11 Pro", "OS=12.4,name=iPhone XS", "OS=11.4,name=iPhone X"]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: iOS - ${{ matrix.destination }}
+        run: xcodebuild -workspace "HTMLKit.xcworkspace" -scheme "HTMLKit-iOS" -destination "${{ matrix.destination }}" clean test | xcpretty

.jazzy.yaml

@@ -1,5 +1,5 @@
 module: HTMLKit
-module_version: 2.0.0
+module_version: 4.1.0
 author: Iskandar Abudiab 
 author_url: https://twitter.com/iabudiab
 github_url: https://github.com/iabudiab/HTMLKit
@@ -33,6 +33,7 @@ custom_categories:
     - HTMLTemplate
     - HTMLDOMTokenList
     - HTMLRange
+    - HTMLSerializer
 
   - name: Iteration & Filtering
     children:
@@ -41,7 +42,9 @@ custom_categories:
     - HTMLNodeFilterShowOptions
     - HTMLNodeFilterValue
     - HTMLNodeFilterBlock
+    - HTMLNodeVisitor
     - HTMLSelectorNodeFilter
+    - HTMLTreeVisitor
     - HTMLTreeWalker
 
   - name: Structures

.travis.yml

@@ -1,45 +0,0 @@
-language: objective-c
-osx_image: xcode8.2
-
-branches:
-  except:
-    - gh-pages
-
-install:
-  - gem install xcpretty
-
-env:
-  global:
-    - LC_CTYPE=en_US.UTF-8
-    - LANG=en_US.UTF-8
-    - WORKSPACE=HTMLKit.xcworkspace
-    - IOS_FRAMEWORK_SCHEME=HTMLKit-iOS
-    - MACOS_FRAMEWORK_SCHEME=HTMLKit-macOS
-    - WATCHOS_FRAMEWORK_SCHEME="HTMLKit-watchOS"
-    - TVOS_FRAMEWORK_SCHEME="HTMLKit-tvOS"
-    - IOS_SDK=iphonesimulator10.2
-    - MACOS_SDK=macosx10.12
-    - WATCHOS_SDK=watchsimulator3.1
-    - TVOS_SDK=appletvsimulator10.1
-  matrix:
-    - DESTINATION="arch=x86_64"                              SIMULATOR=""                                   SCHEME="$MACOS_FRAMEWORK_SCHEME"    SDK="$MACOS_SDK"
-    - DESTINATION="OS=9.0,name=iPhone 6"                     SIMULATOR="iPhone 6 (9.0)"                     SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="OS=9.1,name=iPhone 6 Plus"                SIMULATOR="iPhone 6 Plus (9.1)"                SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="OS=9.2,name=iPhone 6S"                    SIMULATOR="iPhone 6S (9.2)"                    SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="OS=9.3,name=iPhone 6S Plus"               SIMULATOR="iPhone 6S Plus (9.3)"               SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="OS=10.1,name=iPhone 7 Plus"               SIMULATOR="iPhone 7 Plus (10.1)"               SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"
-    - DESTINATION="OS=2.2,name=Apple Watch - 42mm"           SIMULATOR="Apple Watch - 42mm (2.2)"           SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  SDK="$WATCHOS_SDK"
-    - DESTINATION="OS=3.1,name=Apple Watch Series 2 - 42mm"  SIMULATOR="Apple Watch Series 2 - 42mm (3.1)"  SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  SDK="$WATCHOS_SDK"
-    - DESTINATION="OS=9.0,name=Apple TV 1080p"               SIMULATOR="Apple TV 1080p (9.2)"               SCHEME="$TVOS_FRAMEWORK_SCHEME"     SDK="$TVOS_SDK"
-    - DESTINATION="OS=10.0,name=Apple TV 1080p"              SIMULATOR="Apple TV 1080p (10.0)"              SCHEME="$TVOS_FRAMEWORK_SCHEME"     SDK="$TVOS_SDK"
-
-script:
-  - set -o pipefail
-  - xcodebuild -version
-  - xcodebuild -showsdks
-  - SIMULATOR_ID=$(xcrun instruments -s devices | grep -io "$SIMULATOR \[.*\]" | grep -o "\[.*\]" | sed "s/^\[\(.*\)\]$/\1/")
-  - open -b com.apple.iphonesimulator --args -CurrentDeviceUDID $SIMULATOR_ID
-  - travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO clean build | xcpretty -c
-  - if [ "$SDK" != "$WATCHOS_SDK" ]; then
-      travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO test | xcpretty -c;
-    fi

CHANGELOG.md

@@ -1,5 +1,185 @@
 # Change Log
 
+## [4.1.0](https://github.com/iabudiab/HTMLKit/releases/tag/4.1.0)
+
+- Updated project for Xcode 12.5
+
+## [4.0.0](https://github.com/iabudiab/HTMLKit/releases/tag/4.0.0)
+
+Release on 2020.07.16
+
+### Breaking Change
+
+- Swift package version updated to 5.1
+
+
+## [3.1.0](https://github.com/iabudiab/HTMLKit/releases/tag/3.1.0)
+
+Release on 2019.08.20
+
+### Added
+
+- `HTMLTreeVisitor` that walks the DOM in tree order
+- New HTML serialization implementation based on visitor pattern
+
+### Fixes
+
+- HTML serialization for deeply nested DOM trees (issue #33)
+- Occasional Internal Consistency exceptions when deallocating node iterator (issue #36)
+
+
+## [3.0.0](https://github.com/iabudiab/HTMLKit/releases/tag/3.0.0) 
+
+Released on 2019.03.28
+
+### Breaking Change
+
+- Introduce prefix for `NSString` and `NSCharacterSet` categories to prevent collision with existing code (issue #35)
+
+
+## [2.1.5](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.5) 
+
+Released on 2018.07.16
+
+### Fixes
+
+- Parser would handle foreign attributes incorrectly (issue #30)
+
+
+## [2.1.4](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.4) 
+
+Released on 2018.05.01
+
+### Fixes
+
+- `gt(n)`, `lt(n)` and `eq(n)` selectors would select wrong elements for the zero-index (issue #25)
+
+
+## [2.1.3](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.3) 
+
+Released on 2018.03.21
+
+### Fixes
+
+- `HTMLElement` clone would return an immutable dictionary for attributes (issue #20)
+	- Fixed by @CRivlaldo in PR #24
+- `HTMLNodeFilterBlock` would behave differently on simulator and device (issue #22)
+	- Fixed by @CRivlaldo in PR #23
+
+
+## [2.1.2](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.2) 
+
+Released on 2017.11.6
+
+### Fixes
+
+- `HTMLText` serialization (issue #16)
+- `HTMLElement` attribute value serialization (issue #17)
+
+
+## [2.1.1](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.1) 
+
+Released on 2017.10.13
+
+### Hotfix
+
+- Fixed documentation comments
+	- Should fix CocoaDocs generation and percentage
+
+
+## [2.1.0](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.0) 
+
+Released on 2017.10.12
+
+### Added
+
+- Standarized tokenizer error codes:
+	- [whatwg/html#2701](https://github.com/whatwg/html/pull/2701)
+	- [html5lib/html5lib-tests#92](https://github.com/html5lib/html5lib-tests/pull/92)
+
+### Updated
+
+- Project for Xcode 9
+- Travis config for iOS 11.0, macOS 10.13, tvOS 11.0 and watchOS 4.0
+- Updated HTML5Lib-Tests submodule (cbafeba)
+
+## [2.0.6](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.6) 
+
+Released on 2017.05.02
+
+### Added
+
+- Memory consumption improvements (issue #10)
+	- Allocate `childNodes` collection in `HTMLNode` only when inserting child nodes
+	- Replace `NSStringFromSelector` calls with constants in `HTMLNode` validations
+	- Improve `reverseObjectEnumerator` usage while parsing HTML
+	- Rewrite internal logic of the `HTMLStackOfOpenElements` to prevent excessive allocations
+
+
+## [2.0.5](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.5) 
+
+Released on 2017.04.19
+
+### Fixed
+
+- Xcode 8.3 issue with modulemaps
+	- Temporary workaround (renamed modulemap file)
+- Memory Leaks in `CSSInputStream`
+
+### Added
+
+- Minor memory consumption improvements
+	- Collections for child nodes or attributes of HTML Nodes or Elements are allocated lazily
+	- Underyling data string of `CharacterData` is allocated on first access
+	- Autorelease pool for the main `HTMLTokenizer` loop
+
+
+## [2.0.4](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.4) 
+
+Released on 2017.04.2
+
+### Fixed
+
+- Testing with Swift 3.1
+	- Fixed by @tali in PR #8
+
+### Deprecated
+
+- `HTMLRange` initializers with typo
+	- `initWithDowcument:startContainer:startOffset:endContainer:endOffset:`
+
+
+## [2.0.3](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.3) 
+
+Released on 2017.03.6
+
+### Fixed
+
+- Compilation for Swift 3.1
+	- Fixed by @tali in PR #6
+
+
+## [2.0.2](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.2) 
+
+Released on 2017.02.26
+
+### Fixed
+
+- Retain cycles in `HTMLNodeIterator` (issue #4)
+- Retain cycles in `HTMLRange` (issue #5)
+- The layout of `HTMLKit` tests module for Swift Package Manager
+
+
+## [2.0.1](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.1) 
+
+Released on 2017.02.20
+
+### Hotifx
+
+- Set `INSTALL_PATH` and `DYLIB_INSTALL_NAME_BASE` to `@rpath` for macOS target
+	- This fixes embedding `HTMLKit` in a Cocoa application
+
+
 ## [2.0.0](https://github.com/iabudiab/HTMLKit/releases/tag/2.0.0) 
 
 Released on 2017.02.11

Example/HTMLKitExample/HTMLKitExample.xcodeproj/project.pbxproj

@@ -89,7 +89,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = iabudiab;
 				TargetAttributes = {
 					629A63C81D9AFE0E0089679F = {
@@ -100,10 +100,11 @@
 			};
 			buildConfigurationList = 629A63C41D9AFE0E0089679F /* Build configuration list for PBXProject "HTMLKitExample" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 629A63C01D9AFE0E0089679F;
 			productRefGroup = 629A63CA1D9AFE0E0089679F /* Products */;
@@ -131,20 +132,31 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -179,20 +191,31 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -212,22 +235,25 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 			};
 			name = Release;
 		};
 		629A63D11D9AFE0E0089679F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		629A63D21D9AFE0E0089679F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "-";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -250,6 +276,7 @@
 				629A63D21D9AFE0E0089679F /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

Example/HTMLKitExample/HTMLKitExample.xcodeproj/xcshareddata/xcschemes/HTMLKitExample.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:HTMLKitExample.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:HTMLKitExample.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Example/HTMLKitExample/HTMLKitExample/main.swift

@@ -112,7 +112,7 @@ do {
 	try scraper.load()
 
 	// Parse the selector
-	let repositoryContent = try CSSSelectorParser.parseSelector("[role='main'] .repository-content > .file-wrap > .files tr.js-navigation-item")
+	let repositoryContent = try CSSSelectorParser.parseSelector(".repository-content > .file-wrap > table.files tr.js-navigation-item")
 
 	// Query matching elements
 	let files =  try scraper.listElements(matching: repositoryContent)
@@ -131,13 +131,10 @@ do {
 	// The following selector: "[role='main'] div.file table.js-file-line-container td:nth-child(2)"
 	// can be defined in type-safe manner:
 	let selector = allOf([
-		descendantOfElementSelector(
-			attributeSelector(.exactMatch, "role", "main")
-		),
 		descendantOfElementSelector(
 			allOf([
 				typeSelector("div"),
-				classSelector("file")
+				classSelector("repository-content")
 			])
 		),
 		descendantOfElementSelector(

HTMLKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name               = "HTMLKit"
-  s.version            = "2.0.0"
+  s.version            = "4.1.0"
   s.summary            = "HTMLKit, an Objective-C framework for your everyday HTML needs."
   s.license            = "MIT"
   s.homepage           = "https://github.com/iabudiab/HTMLKit"

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,6 +28,15 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62ECBF4C1C0B6C7600AF847B"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-iOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -54,17 +63,6 @@
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "62ECBF4C1C0B6C7600AF847B"
-            BuildableName = "HTMLKit.framework"
-            BlueprintName = "HTMLKit-iOS"
-            ReferencedContainer = "container:HTMLKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -85,8 +83,6 @@
             ReferencedContainer = "container:HTMLKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-macOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,6 +28,15 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "625A14AB19C7829400AD0C32"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-macOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -54,17 +63,6 @@
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "625A14AB19C7829400AD0C32"
-            BuildableName = "HTMLKit.framework"
-            BlueprintName = "HTMLKit-macOS"
-            ReferencedContainer = "container:HTMLKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -85,8 +83,6 @@
             ReferencedContainer = "container:HTMLKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-tvOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -28,6 +28,15 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "62857CE91D39A262008DC254"
+            BuildableName = "HTMLKit.framework"
+            BlueprintName = "HTMLKit-tvOS"
+            ReferencedContainer = "container:HTMLKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -48,17 +57,6 @@
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "62857CE91D39A262008DC254"
-            BuildableName = "HTMLKit.framework"
-            BlueprintName = "HTMLKit-tvOS"
-            ReferencedContainer = "container:HTMLKit.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -79,8 +77,6 @@
             ReferencedContainer = "container:HTMLKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

HTMLKit.xcodeproj/xcshareddata/xcschemes/HTMLKit-watchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -30,8 +30,6 @@
       codeCoverageEnabled = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -52,8 +50,6 @@
             ReferencedContainer = "container:HTMLKit.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Iskandar Abudiab
+Copyright (c) 2014-2020 Iskandar Abudiab
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Package.swift

@@ -1,5 +1,9 @@
+// swift-tools-version:5.1
 import PackageDescription
 
 let package = Package(
-	name: "HTMLKit"
+	name: "HTMLKit",
+	products: [.library(name: "HTMLKit", targets: ["HTMLKit"])],
+	targets: [.target(name: "HTMLKit", dependencies: [], path: "Sources")],
+	swiftLanguageVersions: [.v5]
 )

README.md

@@ -4,7 +4,8 @@
 
 An Objective-C framework for your everyday HTML needs.
 
-[![Build Status](https://img.shields.io/travis/iabudiab/HTMLKit/master.svg?style=flat)](https://travis-ci.org/iabudiab/HTMLKit)
+[![Build Status](https://img.shields.io/travis/iabudiab/HTMLKit/develop.svg?style=flat)](https://travis-ci.org/iabudiab/HTMLKit)
+[![codecov](https://codecov.io/gh/iabudiab/HTMLKit/branch/develop/graph/badge.svg)](https://codecov.io/gh/iabudiab/HTMLKit)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/HTMLKit.svg?style=flat)](https://cocoapods.org/pods/HTMLKit)
 [![CocoaDocs](https://img.shields.io/cocoapods/metrics/doc-percent/HTMLKit.svg?style=flat)](http://cocoadocs.org/docsets/HTMLKit)
@@ -75,10 +76,8 @@ $ gem install cocoapods
 To add `HTMLKit` as a dependency into your project using CocoaPods just add the following in your `Podfile`:
 
 ```ruby
-use_frameworks!
-
 target 'MyTarget' do
-  pod 'HTMLKit', '~> 2.0'
+  pod 'HTMLKit', '~> 4.1'
 end
 ```
 
@@ -95,7 +94,7 @@ $ pod install
 Add `HTMLKit` to your `Package.swift` dependecies:
 
 ```swift
-.Package(url: "https://github.com/iabudiab/HTMLKit", majorVersion: 2)
+.package(url: "https://github.com/iabudiab/HTMLKit", .upToNextMajor(from: "4.0.0")),
 ```
 
 Then run:

Sources/CSSAttributeSelector.m

@@ -61,7 +61,7 @@
 		}
 		case CSSAttributeSelectorIncludes:
 		{
-			NSArray *components = [element[_name] componentsSeparatedByCharactersInSet:[NSCharacterSet HTMLWhitespaceCharacterSet]];
+			NSArray *components = [element[_name] componentsSeparatedByCharactersInSet:[NSCharacterSet htmlkit_HTMLWhitespaceCharacterSet]];
 			return [components containsObject:_value];
 		}
 		case CSSAttributeSelectorBegins:

Sources/CSSInputStream.m

@@ -24,14 +24,14 @@
 
 - (NSString *)consumeIdentifier
 {
-	CFMutableStringRef value = CFStringCreateMutable(kCFAllocatorDefault, 0);
-
 	if (!isValidIdentifierStart([self inputCharacterPointAtOffset:0],
 								[self inputCharacterPointAtOffset:1],
 								[self inputCharacterPointAtOffset:2])) {
 		return nil;
 	}
 
+	CFMutableStringRef value = CFStringCreateMutable(kCFAllocatorDefault, 0);
+
 	while (YES) {
 		UTF32Char codePoint = [self consumeNextInputCharacter];
 		if (codePoint == EOF) {
@@ -47,7 +47,12 @@
 		}
 	}
 
-	return (__bridge NSString *)(CFStringGetLength(value) > 0 ? value : nil);
+	if (CFStringGetLength(value) > 0) {
+		return (__bridge_transfer NSString *)value;
+	}
+
+	CFRelease(value);
+	return nil;
 }
 
 - (NSString *)consumeStringWithEndingCodePoint:(UTF32Char)endingCodePoint
@@ -85,7 +90,12 @@
 		}
 	}
 
-	return (__bridge NSString *)(CFStringGetLength(value) > 0 ? value : nil);
+	if (CFStringGetLength(value) > 0) {
+		return (__bridge_transfer NSString *)value;
+	}
+
+	CFRelease(value);
+	return nil;
 }
 
 - (UTF32Char)consumeEscapedCodePoint
@@ -105,7 +115,7 @@
 			[self consumeNextInputCharacter];
 		}
 
-		NSScanner *scanner = [NSScanner scannerWithString:(__bridge NSString *)(hexString)];
+		NSScanner *scanner = [NSScanner scannerWithString:(__bridge_transfer NSString *)(hexString)];
 		unsigned int number;
 		[scanner scanHexInt:&number];
 

Sources/CSSNthExpressionParser.m

@@ -8,7 +8,7 @@
 
 #import "CSSNthExpressionParser.h"
 #import "CSSCodePoints.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 #import "NSCharacterSet+HTMLKit.h"
 
 @implementation CSSNthExpressionParser
@@ -26,7 +26,7 @@
 		return CSSNthExpressionEven;
 	}
 
-	NSCharacterSet *set = [[NSCharacterSet CSSNthExpressionCharacterSet] invertedSet];
+	NSCharacterSet *set = [[NSCharacterSet htmlkit_CSSNthExpressionCharacterSet] invertedSet];
 	if ([string rangeOfCharacterFromSet:set].location != NSNotFound) {
 		return CSSNthExpressionMake(0, 0);
 	}

Sources/CSSNthExpressionSelector.m

@@ -38,7 +38,7 @@ NSString * _Nonnull NSStringFromNthExpression(CSSNthExpression expression)
 
 #pragma mark - Implementation
 
-NSInteger computeIndex(NSEnumerator *enumerator, HTMLElement *element)
+NS_INLINE NSInteger computeIndex(NSEnumerator *enumerator, HTMLElement *element)
 {
 	NSInteger index = 0;
 	for (HTMLNode *node in enumerator) {

Sources/CSSSelectorParser.m

@@ -10,7 +10,7 @@
 #import "CSSInputStream.h"
 #import "CSSCodePoints.h"
 #import "CSSSelectors.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 #import "NSCharacterSet+HTMLKit.h"
 #import "CSSNthExpressionParser.h"
 #import "CSSCompoundSelector.h"

Sources/CSSStructuralPseudoSelectors.m

@@ -9,7 +9,7 @@
 #import "CSSStructuralPseudoSelectors.h"
 #import "CSSSelectors.h"
 #import "HTMLElement.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 
 #pragma mark - Elements
 
@@ -276,7 +276,7 @@ CSSSelector * ltSelector(NSInteger index)
 	return namedBlockSelector(name, ^BOOL(HTMLElement * _Nonnull element) {
 		NSUInteger elementIndex = [element.parentElement indexOfChildNode:element];
 
-		if (index > 0) {
+		if (index >= 0) {
 			return elementIndex < index;
 		} else {
 			return elementIndex < element.parentElement.childNodesCount - index - 1;
@@ -290,7 +290,7 @@ CSSSelector * gtSelector(NSInteger index)
 	return namedBlockSelector(name, ^BOOL(HTMLElement * _Nonnull element) {
 		NSUInteger elementIndex = [element.parentElement indexOfChildNode:element];
 
-		if (index > 0) {
+		if (index >= 0) {
 			return elementIndex > index;
 		} else {
 			return elementIndex > element.parentElement.childNodesCount - index - 1;
@@ -304,7 +304,7 @@ CSSSelector * eqSelector(NSInteger index)
 	return namedBlockSelector(name, ^BOOL(HTMLElement * _Nonnull element) {
 		NSUInteger elementIndex = [element.parentElement indexOfChildNode:element];
 
-		if (index > 0) {
+		if (index >= 0) {
 			return elementIndex == index;
 		} else {
 			return elementIndex == element.parentElement.childNodesCount - index - 1;

Sources/CSSTypeSelector.m

@@ -8,7 +8,7 @@
 
 #import "CSSTypeSelector.h"
 #import "HTMLElement.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 
 @interface CSSTypeSelector ()
 {

Sources/HTMLCharacterData.m

@@ -24,14 +24,25 @@
 {
 	self = [super initWithName:name type:type];
 	if (self) {
-		_data = [[NSMutableString alloc] initWithString:data ?: @""];
+		if (data) {
+			_data = [[NSMutableString alloc] initWithString:data];
+		}
 	}
 	return self;
 }
 
+- (NSString *)data
+{
+	if (_data == nil) {
+		_data = [[NSMutableString alloc] initWithString:@""];
+	}
+
+	return _data;
+}
+
 - (NSString *)textContent
 {
-	return [_data copy];
+	return [self.data copy];
 }
 
 - (void)setTextContent:(NSString *)textContent
@@ -41,7 +52,7 @@
 
 - (NSUInteger)length
 {
-	return _data.length;
+	return self.data.length;
 }
 
 #pragma mark - Data
@@ -81,7 +92,7 @@ NS_INLINE void CheckValidOffset(HTMLCharacterData *node, NSUInteger offset, NSSt
 
 	range.length = MIN(range.length, self.length - range.location);
 
-	[_data replaceCharactersInRange:range withString:data];
+	[(NSMutableString *)self.data replaceCharactersInRange:range withString:data];
 	[self.ownerDocument didRemoveCharacterDataInNode:self atOffset:range.location withLength:range.length];
 	[self.ownerDocument didAddCharacterDataToNode:self atOffset:range.location withLength:data.length];
 }

Sources/HTMLCharacterToken.m

@@ -36,7 +36,7 @@
 
 - (BOOL)isWhitespaceToken
 {
-	return [_characters isHTMLWhitespaceString];
+	return [_characters htmlkit_isHTMLWhitespaceString];
 }
 
 - (BOOL)isEmpty
@@ -46,7 +46,7 @@
 
 - (void)retainLeadingWhitespace
 {
-	NSUInteger index = _characters.leadingHTMLWhitespaceLength;
+	NSUInteger index = _characters.htmlkit_leadingHTMLWhitespaceLength;
 	if (index > 0) {
 		[_characters setString:[_characters substringToIndex:index]];
 	}
@@ -54,7 +54,7 @@
 
 - (void)trimLeadingWhitespace
 {
-	NSUInteger index = _characters.leadingHTMLWhitespaceLength;
+	NSUInteger index = _characters.htmlkit_leadingHTMLWhitespaceLength;
 	if (index > 0) {
 		[_characters setString:[_characters substringFromIndex:index]];
 	}
@@ -67,7 +67,7 @@
 
 - (HTMLCharacterToken *)tokenBySplitingLeadingWhiteSpace
 {
-	NSUInteger index = _characters.leadingHTMLWhitespaceLength;
+	NSUInteger index = _characters.htmlkit_leadingHTMLWhitespaceLength;
 	if (index > 0) {
 		NSString *leading = [_characters substringToIndex:index];
 		[_characters setString:[_characters substringFromIndex:index]];

Sources/HTMLComment.m

@@ -21,13 +21,6 @@
 	return [super initWithName:@"#comment" type:HTMLNodeComment data:data];
 }
 
-#pragma mark - Serialization
-
-- (NSString *)outerHTML
-{
-	return [NSString stringWithFormat:@"<!--%@-->", self.data];
-}
-
 #pragma mark - Description
 
 - (NSString *)description

Sources/HTMLDocument.m

@@ -20,8 +20,8 @@
 @interface HTMLDocument ()
 {
 	HTMLDocument *_inertTemplateDocument;
-	NSMutableArray *_nodeIterators;
-	NSMutableArray *_ranges;
+	NSHashTable *_nodeIterators;
+	NSHashTable *_ranges;
 }
 @property (nonatomic, assign) HTMLDocumentReadyState readyState;
 @end
@@ -41,8 +41,8 @@
 	self = [super initWithName:@"#document" type:HTMLNodeDocument];
 	if (self) {
 		_readyState = HTMLDocumentLoading;
-		_nodeIterators = [NSMutableArray new];
-		_ranges = [NSMutableArray new];
+		_nodeIterators = [[NSHashTable alloc] initWithOptions:NSHashTableWeakMemory capacity:10];
+		_ranges = [[NSHashTable alloc] initWithOptions:NSHashTableWeakMemory capacity:10];
 	}
 	return self;
 }
@@ -141,7 +141,7 @@
 
 - (void)detachNodeIterator:(HTMLNodeIterator *)iterator
 {
-	[_nodeIterators removeObject:iterator];
+	// NOOP
 }
 
 #pragma mark - Ranges
@@ -153,7 +153,7 @@
 
 - (void)detachRange:(HTMLRange *)range
 {
-	[_ranges removeObject:range];
+	// NOOP
 }
 
 - (void)didRemoveCharacterDataInNode:(HTMLCharacterData *)node atOffset:(NSUInteger)offset withLength:(NSUInteger)length

Sources/HTMLDocumentType.m

@@ -7,7 +7,7 @@
 //
 
 #import "HTMLDocumentType.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 #import "HTMLNode+Private.h"
 
 NS_INLINE BOOL nilOrEqual(id first, id second) {
@@ -144,13 +144,6 @@ NS_INLINE BOOL nilOrEqual(id first, id second) {
 	return copy;
 }
 
-#pragma mark - Serialization
-
-- (NSString *)outerHTML
-{
-	return [NSString stringWithFormat:@"<!DOCTYPE %@>", self.name];
-}
-
 #pragma mark - Description
 
 - (NSString *)description

Sources/HTMLElement.m

@@ -12,7 +12,7 @@
 #import "HTMLText.h"
 #import "HTMLDOMTokenList.h"
 #import "HTMLOrderedDictionary.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 #import "HTMLNode+Private.h"
 
 @interface HTMLElement ()
@@ -32,7 +32,7 @@
 
 - (instancetype)initWithTagName:(NSString *)tagName
 {
-	return [self initWithTagName:tagName attributes:@{}];
+	return [self initWithTagName:tagName attributes:nil];
 }
 
 - (instancetype)initWithTagName:(NSString *)tagName attributes:(NSDictionary *)attributes
@@ -45,8 +45,9 @@
 	self = [super initWithName:tagName type:HTMLNodeElement];
 	if (self) {
 		_tagName = [tagName copy];
-		_attributes = [HTMLOrderedDictionary new];
+		_attributes = nil;
 		if (attributes != nil) {
+			_attributes = [HTMLOrderedDictionary new];
 			[_attributes addEntriesFromDictionary:attributes];
 		}
 		_htmlNamespace = htmlNamespace;
@@ -56,24 +57,33 @@
 
 #pragma mark - Special Attributes
 
+- (NSMutableDictionary<NSString *,NSString *> *)attributes
+{
+	if (_attributes == nil) {
+		_attributes = [HTMLOrderedDictionary new];
+	}
+
+	return _attributes;
+}
+
 - (NSString *)elementId
 {
-	return _attributes[@"id"] ?: @"";
+	return self.attributes[@"id"] ?: @"";
 }
 
 - (void)setElementId:(NSString *)elementId
 {
-	_attributes[@"id"] = elementId;
+	self.attributes[@"id"] = elementId;
 }
 
 - (NSString *)className
 {
-	return _attributes[@"class"] ?: @"";
+	return self.attributes[@"class"] ?: @"";
 }
 
 - (void)setClassName:(NSString *)className
 {
-	_attributes[@"class"] = className;
+	self.attributes[@"class"] = className;
 }
 
 - (HTMLDOMTokenList *)classList
@@ -85,22 +95,22 @@
 
 - (BOOL)hasAttribute:(NSString *)name
 {
-	return _attributes[name] != nil;
+	return self.attributes[name] != nil;
 }
 
 - (NSString *)objectForKeyedSubscript:(NSString *)name;
 {
-	return _attributes[name];
+	return self.attributes[name];
 }
 
 - (void)setObject:(NSString *)value forKeyedSubscript:(NSString *)attribute
 {
-	_attributes[attribute] = value;
+	self.attributes[attribute] = value;
 }
 
 - (void)removeAttribute:(NSString *)name
 {
-	[_attributes removeObjectForKey:name];
+	[self.attributes removeObjectForKey:name];
 }
 
 - (NSString *)textContent
@@ -134,48 +144,11 @@
 {
 	HTMLElement *copy = [super copyWithZone:zone];
 	copy->_tagName = [_tagName copy];
-	copy->_attributes = [_attributes copy];
+	copy->_attributes = [_attributes mutableCopy];
 	copy->_htmlNamespace = _htmlNamespace;
 	return copy;
 }
 
-#pragma mark - Serialization
-
-- (NSString *)outerHTML
-{
-	NSMutableString *result = [NSMutableString string];
-
-	[result appendFormat:@"<%@", self.tagName];
-	[self.attributes enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
-		NSRange range = NSMakeRange(0, value.length);
-		NSMutableString *escaped = [value mutableCopy];
-		[escaped replaceOccurrencesOfString:@"&" withString:@"&amp;" options:0 range:range];
-		[escaped replaceOccurrencesOfString:@"\00A0" withString:@"&nbsp;" options:0 range:range];
-		[escaped replaceOccurrencesOfString:@"\"" withString:@"&quot;" options:0 range:range];
-
-		[result appendFormat:@" %@=\"%@\"", key, escaped];
-	}];
-
-	[result appendString:@">"];
-
-	if ([self.tagName isEqualToAny:@"area", @"base", @"basefont", @"bgsound", @"br", @"col", @"embed",
-		 @"frame", @"hr", @"img", @"input", @"keygen", @"link", @"menuitem", @"meta", @"param", @"source",
-		 @"track", @"wbr", nil]) {
-		return result;
-	}
-
-	if ([self.tagName isEqualToAny:@"pre", @"textarea", @"listing", nil] && self.firstChild.nodeType == HTMLNodeText) {
-		HTMLText *textNode = (HTMLText *)self.firstChild;
-		if ([textNode.data hasPrefix:@"\n"]) {
-			[result appendString:@"\n"];
-		}
-	}
-	[result appendString:self.innerHTML];
-	[result appendFormat:@"</%@>", self.tagName];
-
-	return result;
-}
-
 #pragma mark - Description
 
 - (NSString *)description

Sources/HTMLInputStreamReader.m

@@ -48,10 +48,10 @@
 
 #pragma mark - Errors
 
-- (void)emitParseError:(NSString *)reason
+- (void)emitParseError:(NSString *)code details:(NSString *)details
 {
 	if (self.errorCallback) {
-		self.errorCallback(reason);
+		self.errorCallback(code, details);
 	}
 }
 
@@ -82,16 +82,16 @@
 		return LINE_FEED;
 	}
 	if (CFStringIsSurrogateLowCharacter(nextInputCharacter)) {
-		NSString *reason = [NSString stringWithFormat:@"Non-Unicode character found (an isolated low surrogate: 0x%X)", (unsigned int)nextInputCharacter];
-		[self emitParseError:reason];
+		NSString *details = [NSString stringWithFormat:@"Non-Unicode character found (an isolated low surrogate: 0x%X)", (unsigned int)nextInputCharacter];
+		[self emitParseError:@"surrogate-in-input-stream" details:details];
 		return nextInputCharacter;
 	}
 
 	if (CFStringIsSurrogateHighCharacter(nextInputCharacter)) {
 		UniChar surrogateLow = CFStringGetCharacterFromInlineBuffer(&_buffer, _location + 1);
 		if (CFStringIsSurrogateLowCharacter(surrogateLow) == NO) {
-			NSString *reason = [NSString stringWithFormat:@"Non-Unicode character found (an isolated high surrogate: 0x%X)", (unsigned int)nextInputCharacter];
-			[self emitParseError:reason];
+			NSString *details = [NSString stringWithFormat:@"Non-Unicode character found (an isolated high surrogate: 0x%X)", (unsigned int)nextInputCharacter];
+			[self emitParseError:@"surrogate-in-input-stream" details:details];
 			return nextInputCharacter;
 		}
 
@@ -99,9 +99,14 @@
 		nextInputCharacter = CFStringGetLongCharacterForSurrogatePair(nextInputCharacter, surrogateLow);
 	}
 
-	if (isControlOrUndefinedCharacter(nextInputCharacter)) {
-		NSString *reason = [NSString stringWithFormat:@"A control/undefined character found: (0x%X)", (unsigned int)nextInputCharacter];
-		[self emitParseError:reason];
+	if (isControlCharacter(nextInputCharacter)) {
+		NSString *details = [NSString stringWithFormat:@"A control character found: (0x%X)", (unsigned int)nextInputCharacter];
+		[self emitParseError:@"control-character-in-input-stream" details:details];
+	}
+
+	if (isNoncharacter(nextInputCharacter)) {
+		NSString *details = [NSString stringWithFormat:@"A noncharacter found: (0x%X)", (unsigned int)nextInputCharacter];
+		[self emitParseError:@"noncharacter-in-input-stream" details:details];
 	}
 
 	return nextInputCharacter;
@@ -165,7 +170,7 @@
 
 - (BOOL)consumeHexNumber:(unsigned long long *)result
 {
-	NSCharacterSet *set = [NSCharacterSet HTMLHexNumberCharacterSet];
+	NSCharacterSet *set = [NSCharacterSet htmlkit_HTMLHexNumberCharacterSet];
 
 	NSString *string = nil;
 	BOOL success = [_scanner scanCharactersFromSet:set intoString:&string];

Sources/HTMLKit-Info.plist

@@ -17,13 +17,13 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2014 BrainCookie. All rights reserved.</string>
+	<string>Copyright © 2014 iabudiab. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Sources/HTMLListOfActiveFormattingElements.m

@@ -46,7 +46,7 @@
 - (void)addElement:(HTMLElement *)element
 {
 	NSUInteger existing = 0;
-	for (HTMLElement *node in _list.reverseObjectEnumerator.allObjects) {
+	for (HTMLElement *node in _list.reverseObjectEnumerator) {
 		if ([node isEqual:[HTMLMarker marker]]) {
 			break;
 		}

Sources/HTMLNode.m

@@ -18,6 +18,11 @@
 #import "CSSSelector.h"
 #import "HTMLDocument+Private.h"
 #import "HTMLDOMUtils.h"
+#import "HTMLSerializer.h"
+
+NSString * const ValidationNodePreInsertion = @"-ensurePreInsertionValidityOfNode:beforeChildNode:";
+NSString * const ValidationNodeReplacement = @"-ensureReplacementValidityOfChildNode:withNode:";
+NSString * const RemoveChildNode = @"-removeChildNode:";
 
 @interface HTMLNode ()
 {
@@ -36,13 +41,22 @@
 	if (self) {
 		_name = name;
 		_nodeType = type;
-		_childNodes = [NSMutableOrderedSet new];
+		_childNodes = nil;
 	}
 	return self;
 }
 
 #pragma mark - Properties
 
+- (NSOrderedSet<HTMLNode *> *)childNodes
+{
+	if (_childNodes == nil) {
+		_childNodes = [NSMutableOrderedSet new];
+	}
+
+	return _childNodes;
+}
+
 - (HTMLDocument *)ownerDocument
 {
 	if (_nodeType == HTMLNodeDocument) {
@@ -55,7 +69,9 @@
 - (void)setOwnerDocument:(HTMLDocument *)ownerDocument
 {
 	_ownerDocument = ownerDocument;
-	[self.childNodes.array makeObjectsPerformSelector:@selector(setOwnerDocument:) withObject:ownerDocument];
+	for (HTMLNode *child in _childNodes) {
+		[child setOwnerDocument:ownerDocument];
+	}
 }
 
 - (HTMLNode *)rootNode
@@ -75,12 +91,12 @@
 
 - (HTMLNode *)firstChild
 {
-	return self.childNodes.firstObject;
+	return _childNodes.firstObject;
 }
 
 - (HTMLNode *)lastChild
 {
-	return self.childNodes.lastObject;
+	return _childNodes.lastObject;
 }
 
 - (HTMLNode *)previousSibling
@@ -112,7 +128,7 @@
 
 - (HTMLElement *)nextSiblingElement
 {
-	HTMLNode *node = self.previousSibling;
+	HTMLNode *node = self.nextSibling;
 	while (node && node.nodeType != HTMLNodeElement) {
 		node = node.nextSibling;
 	}
@@ -121,7 +137,7 @@
 
 - (NSUInteger)index
 {
-	return [self.parentNode indexOfChildNode:self];
+	return [_parentNode indexOfChildNode:self];
 }
 
 - (NSString *)textContent
@@ -141,16 +157,34 @@
 	return (HTMLElement *)self;
 }
 
+- (HTMLText *)asText
+{
+	return (HTMLText *)self;
+}
+
+- (HTMLComment *)asComment
+{
+	return (HTMLComment *)self;
+}
+- (HTMLDocumentType *)asDocumentType
+{
+	return (HTMLDocumentType *)self;
+}
+
 #pragma mark - Child Nodes
 
 - (BOOL)hasChildNodes
 {
-	return self.childNodes.count > 0;
+	return _childNodes.count > 0;
 }
 
 - (BOOL)hasChildNodeOfType:(HTMLNodeType)type
 {
-	NSUInteger index = [self.childNodes indexOfObjectPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop) {
+	if (_childNodes == nil) {
+		return NO;
+	}
+
+	NSUInteger index = [_childNodes indexOfObjectPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop) {
 		if ([(HTMLNode *)obj nodeType] == type) {
 			*stop = YES;
 			return YES;
@@ -163,7 +197,7 @@
 
 - (NSUInteger)childNodesCount
 {
-	return self.childNodes.count;
+	return _childNodes.count;
 }
 
 - (BOOL)isEmpty
@@ -173,25 +207,25 @@
 
 - (HTMLNode *)childNodeAtIndex:(NSUInteger)index
 {
-	return [self.childNodes objectAtIndex:index];
+	return [_childNodes objectAtIndex:index];
 }
 
 - (NSUInteger)childElementsCount
 {
-	return [self.childNodes indexesOfObjectsPassingTest:^BOOL(HTMLNode *  _Nonnull node, NSUInteger idx, BOOL * _Nonnull stop) {
+	return [_childNodes indexesOfObjectsPassingTest:^BOOL(HTMLNode *  _Nonnull node, NSUInteger idx, BOOL * _Nonnull stop) {
 		return node.nodeType == HTMLNodeElement;
 	}].count;
 }
 
 - (NSUInteger)indexOfChildNode:(HTMLNode *)node
 {
-	return [self.childNodes indexOfObject:node];
+	return [_childNodes indexOfObject:node];
 }
 
 - (HTMLElement *)childElementAtIndex:(NSUInteger)index
 {
 	NSUInteger counter = 0;
-	for (HTMLNode *node in self.childNodes) {
+	for (HTMLNode *node in _childNodes) {
 		if (node.nodeType == HTMLNodeElement) {
 			if (counter == index) {
 				return node.asElement;
@@ -205,7 +239,7 @@
 - (NSUInteger)indexOfChildElement:(HTMLElement *)element
 {
 	NSUInteger counter = 0;
-	for (HTMLNode *node in self.childNodes) {
+	for (HTMLNode *node in _childNodes) {
 		if (node.nodeType == HTMLNodeElement) {
 			if (node == element) {
 				return counter;
@@ -262,7 +296,9 @@
 		[node removeAllChildNodes];
 	}
 
-	[nodes makeObjectsPerformSelector:@selector(setParentNode:) withObject:self];
+	for (HTMLNode *node in nodes) {
+		[node setParentNode:self];
+	}
 
 	return node;
 }
@@ -290,7 +326,7 @@
 
 - (void)removeFromParentNode
 {
-	[self.parentNode removeChildNode:self];
+	[_parentNode removeChildNode:self];
 }
 
 - (HTMLNode *)removeChildNode:(HTMLNode *)child
@@ -298,7 +334,7 @@
 	if (child.parentNode != self) {
 		[NSException raise:HTMLKitNotFoundError
 					format:@"%@: Not Fount Error, removing non-child node %@. The object can not be found here.",
-		 NSStringFromSelector(_cmd), child];
+		 RemoveChildNode, child];
 	}
 
 	HTMLNode *oldNode = child;
@@ -322,16 +358,18 @@
 
 - (void)reparentChildNodesIntoNode:(HTMLNode *)node
 {
-	for (HTMLNode *child in self.childNodes.array) {
+	for (HTMLNode *child in _childNodes) {
 		[node appendNode:child];
 	}
-	[(NSMutableOrderedSet *)self.childNodes removeAllObjects];
+	[(NSMutableOrderedSet *)_childNodes removeAllObjects];
 }
 
 - (void)removeAllChildNodes
 {
-	[self.childNodes.array makeObjectsPerformSelector:@selector(setParentNode:) withObject:nil];
-	[(NSMutableOrderedSet *)self.childNodes removeAllObjects];
+	for (HTMLNode *child in _childNodes) {
+		[child setParentNode:nil];
+	}
+	[(NSMutableOrderedSet *)_childNodes removeAllObjects];
 }
 
 - (HTMLDocumentPosition)compareDocumentPositionWithNode:(HTMLNode *)otherNode
@@ -345,16 +383,16 @@
 	}
 
 	if (self.ownerDocument != otherNode.ownerDocument) {
-		return (HTMLDocumentPositionDisconnected | HTMLDocumentPositionImplementationSpecific |
-				self.hash < otherNode.hash ? HTMLDocumentPositionPreceding : HTMLDocumentPositionFollowing);
+		return ((HTMLDocumentPositionDisconnected | HTMLDocumentPositionImplementationSpecific |
+				self.hash < otherNode.hash) ? HTMLDocumentPositionPreceding : HTMLDocumentPositionFollowing);
 	}
 
 	NSArray *ancestors1 = GetAncestorNodes(self);
 	NSArray *ancestors2 = GetAncestorNodes(otherNode);
 
 	if (ancestors1.lastObject != ancestors2.lastObject) {
-		return (HTMLDocumentPositionDisconnected | HTMLDocumentPositionImplementationSpecific |
-				self.hash < otherNode.hash ? HTMLDocumentPositionPreceding : HTMLDocumentPositionFollowing);
+		return ((HTMLDocumentPositionDisconnected | HTMLDocumentPositionImplementationSpecific |
+				self.hash < otherNode.hash) ? HTMLDocumentPositionPreceding : HTMLDocumentPositionFollowing);
 	}
 
 	NSUInteger index1 = ancestors1.count;
@@ -402,7 +440,7 @@
 		return self.nodeType != HTMLNodeDocument && self.ownerDocument == otherNode;
 	}
 
-	for (HTMLNode *parentNode = self.parentNode; parentNode; parentNode = parentNode.parentNode) {
+	for (HTMLNode *parentNode = _parentNode; parentNode; parentNode = parentNode.parentNode) {
 		if (parentNode == otherNode) {
 			return YES;
 		}
@@ -424,7 +462,7 @@
 		return;
 	}
 
-	[self.childNodes enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+	[_childNodes enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
 		block(obj, idx, stop);
 	}];
 }
@@ -435,7 +473,7 @@
 		return;
 	}
 
-	[self.childNodes enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
+	[_childNodes enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
 		if ([obj isKindOfClass:[HTMLElement class]]) {
 			block([obj asElement], idx, stop);
 		}
@@ -558,18 +596,18 @@ NS_INLINE void CheckInvalidCombination(HTMLNode *parent, HTMLNode *node, NSStrin
 
 - (void)ensurePreInsertionValidityOfNode:(HTMLNode *)node beforeChildNode:(HTMLNode *)child
 {
-	CheckParentValid(self, NSStringFromSelector(_cmd));
+	CheckParentValid(self, ValidationNodePreInsertion);
 
-	CheckChildsParent(self, child, NSStringFromSelector(_cmd));
+	CheckChildsParent(self, child, ValidationNodePreInsertion);
 
-	CheckInsertedNodeValid(node, NSStringFromSelector(_cmd));
+	CheckInsertedNodeValid(node, ValidationNodePreInsertion);
 
-	CheckInvalidCombination(self, node, NSStringFromSelector(_cmd));
+	CheckInvalidCombination(self, node, ValidationNodePreInsertion);
 
-	void (^ hierarchyError)() = ^{
+	void (^ hierarchyError)(void) = ^{
 		[NSException raise:HTMLKitHierarchyRequestError
 					format:@"%@: Hierarchy Request Error, inserting (%@) into (%@). The operation would yield an incorrect node tree.",
-		 NSStringFromSelector(_cmd), self, node];
+		 ValidationNodePreInsertion, self, node];
 	};
 
 	if (self.nodeType == HTMLNodeDocument) {
@@ -608,18 +646,18 @@ NS_INLINE void CheckInvalidCombination(HTMLNode *parent, HTMLNode *node, NSStrin
 
 - (void)ensureReplacementValidityOfChildNode:(HTMLNode *)child withNode:(HTMLNode *)node
 {
-	CheckParentValid(self, NSStringFromSelector(_cmd));
+	CheckParentValid(self, ValidationNodeReplacement);
 
-	CheckChildsParent(self, child, NSStringFromSelector(_cmd));
+	CheckChildsParent(self, child, ValidationNodeReplacement);
 
-	CheckInsertedNodeValid(node, NSStringFromSelector(_cmd));
+	CheckInsertedNodeValid(node, ValidationNodeReplacement);
 
-	CheckInvalidCombination(self, node, NSStringFromSelector(_cmd));
+	CheckInvalidCombination(self, node, ValidationNodeReplacement);
 
-	void (^ hierarchyError)() = ^{
+	void (^ hierarchyError)(void) = ^{
 		[NSException raise:HTMLKitHierarchyRequestError
 					format:@"%@: Hierarchy Request Error. The operation would yield an incorrect node tree.",
-		 NSStringFromSelector(_cmd)];
+		 ValidationNodeReplacement];
 	};
 
 	void (^ checkParentHasAnotherChildOfType)(HTMLNodeType) = ^ void (HTMLNodeType type) {
@@ -675,7 +713,7 @@ NS_INLINE void CheckInvalidCombination(HTMLNode *parent, HTMLNode *node, NSStrin
 	HTMLNode *copy = [self copy];
 
 	if (deep) {
-		for (HTMLNode *child in self.childNodes) {
+		for (HTMLNode *child in _childNodes) {
 			[copy appendNode:[child cloneNodeDeep:YES]];
 		}
 	}
@@ -695,13 +733,12 @@ NS_INLINE void CheckInvalidCombination(HTMLNode *parent, HTMLNode *node, NSStrin
 
 - (NSString *)outerHTML
 {
-	[self doesNotRecognizeSelector:_cmd];
-	return nil;
+	return [HTMLSerializer serializeNode:self scope:HTMLSerializationScopeIncludeRoot];
 }
 
 - (NSString *)innerHTML
 {
-	return [[self.childNodes.array valueForKey:@"outerHTML"] componentsJoinedByString:@""];
+	return [HTMLSerializer serializeNode:self scope:HTMLSerializationScopeChildrenOnly];
 }
 
 - (void)setInnerHTML:(NSString *)outerHTML

Sources/HTMLNodeFilter.m

@@ -15,7 +15,7 @@
 
 @interface HTMLNodeFilterBlock ()
 {
-	BOOL (^ _block)(HTMLNode *);
+	HTMLNodeFilterValue (^ _block)(HTMLNode *);
 }
 @end
 

Sources/HTMLNodeVisitor.m

@@ -0,0 +1,54 @@
+//
+//  HTMLNodeVisitor.m
+//  HTMLKit
+//
+//  Created by Iska on 30.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import "HTMLNodeVisitor.h"
+
+#pragma mark - Block Visitor
+
+@interface HTMLNodeVisitorBlock ()
+{
+	void (^ _enter)(HTMLNode *);
+	void (^ _leave)(HTMLNode *);
+}
+@end
+
+@implementation HTMLNodeVisitorBlock
+
++ (instancetype)visitorWithEnterBlock:(void (^)(HTMLNode * _Nonnull))enterBlock
+						   leaveBlock:(void (^)(HTMLNode * _Nonnull))leaveBlock
+{
+	return [[HTMLNodeVisitorBlock alloc] initWithEnterBlock:enterBlock leaveBlock:leaveBlock];
+}
+
+- (instancetype)initWithEnterBlock:(void (^)(HTMLNode * _Nonnull))enterBlock
+						leaveBlock:(void (^)(HTMLNode * _Nonnull))leaveBlock
+{
+	self = [super init];
+	if (self) {
+		_enter = [enterBlock copy];
+		_leave = [leaveBlock copy];
+	}
+	return self;
+}
+
+- (void)enter:(HTMLNode *)node
+{
+	if (_enter) {
+		_enter(node);
+	}
+}
+
+- (void)leave:(HTMLNode *)node
+{
+	if (_leave) {
+		_leave(node);
+	}
+}
+
+@end
+

Sources/HTMLOrderedDictionary.m

@@ -154,4 +154,11 @@
 	return [_keys countByEnumeratingWithState:state objects:buffer count:len];
 }
 
+#pragma mark - Copying
+
+- (id)mutableCopy
+{
+	return [[HTMLOrderedDictionary alloc] initWithDictionary:self];
+}
+
 @end

Sources/HTMLParseErrorToken.m

@@ -10,29 +10,46 @@
 
 @interface HTMLParseErrorToken ()
 {
-	NSString *_reason;
+	NSString *_code;
+	NSString *_details;
 	NSUInteger _location;
 }
 @end
 
 @implementation HTMLParseErrorToken
-@synthesize reason = _reason;
+@synthesize code = _code;
+@synthesize details = _details;
 @synthesize location = _location;
 
-- (instancetype)initWithReasonMessage:(NSString *)reason andStreamLocation:(NSUInteger)location
+- (instancetype)initWithCode:(NSString *)code details:(NSString *)details location:(NSUInteger)location
 {
 	self = [super init];
 	if (self) {
 		self.type = HTMLTokenTypeParseError;
-		_reason = [reason copy];
+		_code = [code copy];
+		_details = [details copy];
 		_location = location;
 	}
 	return self;
 }
 
+- (BOOL)isEqual:(id)other
+{
+	if ([other isKindOfClass:[self class]]) {
+		HTMLParseErrorToken *token = (HTMLParseErrorToken *)other;
+		return bothNilOrEqual(self.code, token.code);
+	}
+	return NO;
+}
+
+- (NSUInteger)hash
+{
+	return self.code.hash + self.code.hash;
+}
+
 - (NSString *)description
 {
-	return [NSString stringWithFormat:@"<%@: %p Reason='%@' Location='%lu'>", self.class, self, _reason, (unsigned long)_location];
+	return [NSString stringWithFormat:@"<%@: %p Code='%@' Details='%@' Location='%lu'>", self.class, self, _code, _details, (unsigned long)_location];
 }
 
 @end

Sources/HTMLParser.m

@@ -73,6 +73,10 @@
 
 		_tokenizer = [[HTMLTokenizer alloc] initWithString:string ?: @""];
 		_tokenizer.parser = self;
+		__weak HTMLParser *weakSelf = self;
+		_tokenizer.parseErrorCallback = ^(HTMLParseErrorToken *token) {
+			[weakSelf emitParseError:@"Tokenization error: %@", token.asParseError];
+		};
 
 		_pendingTableCharacterTokens = [[HTMLCharacterToken alloc] initWithString:@""];
 
@@ -130,6 +134,10 @@
 	[self initializeDocument];
 	_tokenizer = [[HTMLTokenizer alloc] initWithString:_tokenizer.string];
 	_tokenizer.parser = self;
+	__weak HTMLParser *weakSelf = self;
+	_tokenizer.parseErrorCallback = ^(HTMLParseErrorToken *token) {
+		[weakSelf emitParseError:@"Tokenization error: %@", token.asParseError];
+	};
 
 	_contextElement = contextElement;
 	_fragmentParsingAlgorithm = YES;
@@ -226,11 +234,6 @@
 		return NO;
 	};
 
-	if (token.isParseError) {
-		[self emitParseError:@"Tokenizer Parser Error: %@", token.asParseError];
-		return;
-	}
-
 	if (_ignoreNextLineFeedCharacterToken) {
 		_ignoreNextLineFeedCharacterToken = NO;
 		if (token.isCharacterToken) {
@@ -1139,7 +1142,7 @@
 			if (charactes.length > 0) {
 				[self reconstructActiveFormattingElements];
 				[self insertCharacters:charactes];
-				if (!charactes.isHTMLWhitespaceString) {
+				if (!charactes.htmlkit_isHTMLWhitespaceString) {
 					_framesetOkFlag = NO;
 				}
 			}
@@ -1272,7 +1275,7 @@
 								  @"dd": @[@"dd", @"dt"],
 								  @"dt": @[@"dd", @"dt"]};
 
-		for (HTMLElement *node in _stackOfOpenElements.reverseObjectEnumerator.allObjects) {
+		for (HTMLElement *node in _stackOfOpenElements.reverseObjectEnumerator) {
 			if ([map[tagName] containsObject:node.tagName]) {
 				[self generateImpliedEndTagsExceptForElement:node.tagName];
 				if (![self.currentNode.tagName isEqualToString:node.tagName]) {
@@ -1305,7 +1308,7 @@
 		_framesetOkFlag = NO;
 	} else if ([tagName isEqualToString:@"a"]) {
 		HTMLElement *element = ^ HTMLElement * {
-			for (HTMLElement *element in _listOfActiveFormattingElements.reverseObjectEnumerator) {
+            for (HTMLElement *element in self->_listOfActiveFormattingElements.reverseObjectEnumerator) {
 				if ([element isEqual:[HTMLMarker marker]]) return nil;
 				if ([element.tagName isEqualToString:@"a"]) {
 					return element;
@@ -1440,7 +1443,6 @@
 	} else if ([tagName isEqualToString:@"math"]) {
 		[self reconstructActiveFormattingElements];
 		AdjustMathMLAttributes(token);
-		AdjustForeignAttributes(token);
 		[self insertForeignElementForToken:token inNamespace:HTMLNamespaceMathML];
 		if (token.isSelfClosing) {
 			[_stackOfOpenElements popCurrentNode];
@@ -1448,7 +1450,6 @@
 	} else if ([tagName isEqualToString:@"svg"]) {
 		[self reconstructActiveFormattingElements];
 		AdjustSVGAttributes(token);
-		AdjustForeignAttributes(token);
 		[self insertForeignElementForToken:token inNamespace:HTMLNamespaceSVG];
 		if (token.isSelfClosing) {
 			[_stackOfOpenElements popCurrentNode];
@@ -1529,7 +1530,7 @@
 		}
 		[self closePElement];
 	} else if ([tagName isEqualToString:@"li"]) {
-		if (![_stackOfOpenElements hasElementInListItemScopeWithTagName:@"li"]) {
+		if (![_stackOfOpenElements hasElementInListItemScopeWithTagName:tagName]) {
 			[self emitParseError:@"Unexpected <li> element in <body>"];
 			return;
 		}
@@ -1549,7 +1550,7 @@
 		}
 		[_stackOfOpenElements popElementsUntilElementPoppedWithTagName:tagName];
 	} else if ([tagName isEqualToAny:@"h1", @"h2", @"h3", @"h4", @"h5", @"h6", nil]) {
-		if (![_stackOfOpenElements hasAnyElementInScopeWithAnyOfTagNames:@[@"h1", @"h2", @"h3", @"h4", @"h5", @"h6"]]) {
+		if (![_stackOfOpenElements hasHeaderElementInScope]) {
 			[self emitParseError:@"Unexpected <%@> element in <body>", tagName];
 			return;
 		}
@@ -1569,7 +1570,7 @@
 			return;
 		}
 	} else if ([tagName isEqualToAny:@"applet", @"marquee", @"object", nil]) {
-		if (![_stackOfOpenElements hasAnyElementInScopeWithAnyOfTagNames:@[@"applet", @"marquee", @"object"]]) {
+		if (![_stackOfOpenElements hasElementInScopeWithTagName:tagName]) {
 			[self emitParseError:@"Unexpected <%@> element in <body>", tagName];
 			return;
 		}
@@ -1590,7 +1591,7 @@
 
 - (void)processAnyOtherEndTagTokenInBody:(HTMLTagToken *)token
 {
-	for (HTMLElement *node in _stackOfOpenElements.reverseObjectEnumerator.allObjects) {
+	for (HTMLElement *node in _stackOfOpenElements.reverseObjectEnumerator) {
 		if ([node.tagName isEqualToString:token.tagName]) {
 			[self generateImpliedEndTagsExceptForElement:token.tagName];
 			if (![node.tagName isEqualToString:self.currentNode.tagName]) {
@@ -1775,7 +1776,7 @@
 - (void)HTMLInsertionModeInCaption:(HTMLToken *)token
 {
 	void (^ common) (BOOL) = ^ (BOOL reprocess) {
-		if (![_stackOfOpenElements hasElementInTableScopeWithTagName:@"caption"]) {
+        if (![self->_stackOfOpenElements hasElementInTableScopeWithTagName:@"caption"]) {
 			[self emitParseError:@"Unexpected end tag </caption> for misnested element in <caption>"];
 			return;
 		}
@@ -1783,8 +1784,8 @@
 		if (![self.currentNode.tagName isEqualToString:@"caption"]) {
 			[self emitParseError:@"Misnested <caption> element in <caption>"];
 		}
-		[_stackOfOpenElements popElementsUntilElementPoppedWithTagName:@"caption"];
-		[_listOfActiveFormattingElements clearUptoLastMarker];
+        [self->_stackOfOpenElements popElementsUntilElementPoppedWithTagName:@"caption"];
+        [self->_listOfActiveFormattingElements clearUptoLastMarker];
 		[self switchInsertionMode:HTMLInsertionModeInTable];
 
 		if (reprocess) {
@@ -1889,12 +1890,12 @@
 - (void)HTMLInsertionModeInTableBody:(HTMLToken *)token
 {
 	void (^ common) (BOOL) = ^ (BOOL reprocess) {
-		if (![_stackOfOpenElements hasElementInTableScopeWithAnyOfTagNames:@[@"tbody", @"tfoot", @"thead"]]) {
+        if (![self->_stackOfOpenElements hasElementInTableScopeWithAnyOfTagNames:@[@"tbody", @"tfoot", @"thead"]]) {
 			[self emitParseError:@"Unexpected tag '%@' for misnested element in <tbody>", token.asTagToken.tagName];
 			return;
 		} else {
-			[_stackOfOpenElements clearBackToTableBodyContext];
-			[_stackOfOpenElements popCurrentNode];
+            [self->_stackOfOpenElements clearBackToTableBodyContext];
+            [self->_stackOfOpenElements popCurrentNode];
 			[self switchInsertionMode:HTMLInsertionModeInTable];
 		}
 
@@ -1945,12 +1946,12 @@
 - (void)HTMLInsertionModeInRow:(HTMLToken *)token
 {
 	void (^ common) (NSString *, BOOL) = ^ (NSString *elementTagName, BOOL reprocess) {
-		if (![_stackOfOpenElements hasElementInTableScopeWithTagName:elementTagName]) {
+        if (![self->_stackOfOpenElements hasElementInTableScopeWithTagName:elementTagName]) {
 			[self emitParseError:@"Unexpected tag '%@' for misnested element <%@> in <tr>", token.asTagToken.tagName, elementTagName];
 			return;
 		} else {
-			[_stackOfOpenElements clearBackToTableRowContext];
-			[_stackOfOpenElements popCurrentNode];
+            [self->_stackOfOpenElements clearBackToTableRowContext];
+            [self->_stackOfOpenElements popCurrentNode];
 			[self switchInsertionMode:HTMLInsertionModeInTableBody];
 		}
 
@@ -2312,7 +2313,7 @@
 			[characters enumerateSubstringsInRange:NSMakeRange(0, characters.length)
 										   options:NSStringEnumerationByComposedCharacterSequences
 										usingBlock:^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
-											if (substring.isHTMLWhitespaceString) {
+											if (substring.htmlkit_isHTMLWhitespaceString) {
 												[self insertCharacters:substring];
 											} else {
 												[self emitParseError:@"Unexpected Character (%@) in <frameset>", substring];
@@ -2380,7 +2381,7 @@
 			[characters enumerateSubstringsInRange:NSMakeRange(0, characters.length)
 										   options:NSStringEnumerationByComposedCharacterSequences
 										usingBlock:^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
-											if (substring.isHTMLWhitespaceString) {
+											if (substring.htmlkit_isHTMLWhitespaceString) {
 												[self insertCharacters:substring];
 											} else {
 												[self emitParseError:@"Unexpected Character (%@) after <frameset>", substring];
@@ -2514,8 +2515,8 @@
 										usingBlock:^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) {
 											if ([substring isEqualToString:@"\uFFFD"]) {
 												[self emitParseError:@"Unexpected Character (0x0000) in foreign content"];
-											} else if (!substring.isHTMLWhitespaceString) {
-												_framesetOkFlag = NO;
+											} else if (!substring.htmlkit_isHTMLWhitespaceString) {
+                                                self->_framesetOkFlag = NO;
 											}
 											[self insertCharacters:substring];
 										}];
@@ -2530,7 +2531,7 @@
 			return;
 		case HTMLTokenTypeStartTag:
 		{
-			void (^ anythingElse)() = ^ {
+			void (^ anythingElse)(void) = ^ {
 				if (self.adjustedCurrentNode.htmlNamespace == HTMLNamespaceMathML) {
 					AdjustMathMLAttributes(token.asTagToken);
 				}
@@ -2538,23 +2539,22 @@
 					AdjustSVGNameCase(token.asTagToken);
 					AdjustSVGAttributes(token.asTagToken);
 				}
-				AdjustForeignAttributes(token.asTagToken);
 				[self insertForeignElementForToken:token.asTagToken inNamespace:self.adjustedCurrentNode.htmlNamespace];
 				if (token.asTagToken.selfClosing) {
-					[_stackOfOpenElements popCurrentNode];
+                    [self->_stackOfOpenElements popCurrentNode];
 				}
 			};
 
-			void (^ matchedCase)() = ^ {
+			void (^ matchedCase)(void) = ^ {
 				[self emitParseError:@"Unexpected start tag <%@> in foreign content", token.asTagToken.tagName];
-				if (_fragmentParsingAlgorithm) {
+                if (self->_fragmentParsingAlgorithm) {
 					anythingElse();
 				} else {
-					[_stackOfOpenElements popCurrentNode];
+                    [self->_stackOfOpenElements popCurrentNode];
 					while (!IsNodeMathMLTextIntegrationPoint(self.currentNode) &&
 						   !IsNodeHTMLIntegrationPoint(self.currentNode) &&
 						   self.currentNode.htmlNamespace != HTMLNamespaceHTML) {
-						[_stackOfOpenElements popCurrentNode];
+                        [self->_stackOfOpenElements popCurrentNode];
 					}
 					[self reprocessToken:token];
 				}

Sources/HTMLQuircksMode.m

@@ -0,0 +1,21 @@
+//
+//  HTMLQuircksMode.m
+//  HTMLKit
+//
+//  Created by Iska on 26.03.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "HTMLQuirksMode.h"
+#import "NSString+Private.h"
+
+BOOL QuirksModePrefixMatch(NSString *publicIdentifier)
+{
+	for (int i = 0; i < sizeof(HTMLQuirksModePrefixes) / sizeof(HTMLQuirksModePrefixes[0]); i++) {
+		if ([publicIdentifier hasPrefixIgnoringCase:HTMLQuirksModePrefixes[i]]) {
+			return YES;
+		}
+	}
+	return NO;
+}

Sources/HTMLRange.m

@@ -23,14 +23,28 @@
 
 #pragma mark - Lifecycle
 
+- (instancetype)initWithDocument:(HTMLDocument *)document
+{
+	return [self initWithDocument:document startContainer:document startOffset:0 endContainer:document endOffset:0];
+}
+
 - (instancetype)initWithDowcument:(HTMLDocument *)document
 {
-	return [self initWithDowcument:document startContainer:document startOffset:0 endContainer:document endOffset:0];
+	return [self initWithDocument:document startContainer:document startOffset:0 endContainer:document endOffset:0];
 }
 
 - (instancetype)initWithDowcument:(HTMLDocument *)document
 				   startContainer:(HTMLNode *)startContainer startOffset:(NSUInteger)startOffset
 					 endContainer:(HTMLNode *)endContainer endOffset:(NSUInteger)endOffset
+{
+	return [self initWithDocument:document
+				   startContainer:startContainer startOffset:startOffset
+					 endContainer:endContainer endOffset:endOffset];
+}
+
+- (instancetype)initWithDocument:(HTMLDocument *)document
+				  startContainer:(HTMLNode *)startContainer startOffset:(NSUInteger)startOffset
+					endContainer:(HTMLNode *)endContainer endOffset:(NSUInteger)endOffset
 {
 	self = [super init];
 	if (self) {
@@ -517,7 +531,7 @@ NS_INLINE HTMLCharacterData * CloneCharachterData(HTMLNode *node, NSUInteger sta
 		HTMLNode *clone = [firstPartiallyContainedChild copy];
 		[fragment appendNode:clone];
 
-		HTMLRange *subRange = [[HTMLRange alloc] initWithDowcument:_ownerDocument
+		HTMLRange *subRange = [[HTMLRange alloc] initWithDocument:_ownerDocument
 													startContainer:_startContainer
 													   startOffset:_startOffset
 													  endContainer:firstPartiallyContainedChild
@@ -537,7 +551,7 @@ NS_INLINE HTMLCharacterData * CloneCharachterData(HTMLNode *node, NSUInteger sta
 		HTMLNode *clone = [lastPartiallyContainedChild copy];
 		[fragment appendNode:clone];
 
-		HTMLRange *subRange = [[HTMLRange alloc] initWithDowcument:_ownerDocument
+		HTMLRange *subRange = [[HTMLRange alloc] initWithDocument:_ownerDocument
 													startContainer:lastPartiallyContainedChild
 													   startOffset:0
 													  endContainer:_endContainer
@@ -580,7 +594,7 @@ NS_INLINE HTMLCharacterData * CloneCharachterData(HTMLNode *node, NSUInteger sta
 		HTMLNode *clone = [firstPartiallyContainedChild copy];
 		[fragment appendNode:clone];
 
-		HTMLRange *subRange = [[HTMLRange alloc] initWithDowcument:_ownerDocument
+		HTMLRange *subRange = [[HTMLRange alloc] initWithDocument:_ownerDocument
 													startContainer:_startContainer
 													   startOffset:_startOffset
 													  endContainer:firstPartiallyContainedChild
@@ -601,7 +615,7 @@ NS_INLINE HTMLCharacterData * CloneCharachterData(HTMLNode *node, NSUInteger sta
 		HTMLNode *clone = [lastPartiallyContainedChild copy];
 		[fragment appendNode:clone];
 
-		HTMLRange *subRange = [[HTMLRange alloc] initWithDowcument:_ownerDocument
+		HTMLRange *subRange = [[HTMLRange alloc] initWithDocument:_ownerDocument
 													startContainer:lastPartiallyContainedChild
 													   startOffset:0
 													  endContainer:_endContainer

Sources/HTMLSerializer.m

@@ -0,0 +1,155 @@
+//
+//  HTMLSerializer.m
+//  HTMLKit
+//
+//  Created by Iska on 28.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import "HTMLSerializer.h"
+#import "HTMLDOM.h"
+#import "HTMLNode+Private.h"
+#import "HTMLTreeVisitor.h"
+#import "NSString+Private.h"
+
+#pragma mark - Serializer
+
+@interface HTMLSerializer ()
+{
+	HTMLNode *_root;
+	HTMLTreeVisitor *_treeVisitor;
+	NSUInteger _ignore;
+	NSMutableString *_result;
+}
+- (instancetype)initWithNode:(HTMLNode *)node;
+- (NSString *)serializeWithScope:(HTMLSerializationScope)scope;
+@end
+
+@implementation HTMLSerializer
+
++ (NSString *)serializeNode:(HTMLNode *)node scope:(HTMLSerializationScope)scope
+{
+	HTMLSerializer *serializer = [[HTMLSerializer alloc] initWithNode:node];
+	return [serializer serializeWithScope:scope];
+}
+
+#pragma mark - Lifecycle
+
+- (instancetype)initWithNode:(HTMLNode *)node
+{
+	self = [super init];
+	if (self) {
+		_root = node;
+		_treeVisitor = [[HTMLTreeVisitor alloc] initWithNode:node];
+		_result = [NSMutableString new];
+		_ignore = 0;
+	}
+	return self;
+}
+
+#pragma mark - Serialization
+
+- (NSString *)serializeWithScope:(HTMLSerializationScope)scope
+{
+	[_result setString:@""];
+
+	HTMLNodeVisitorBlock *nodeVisitor = [HTMLNodeVisitorBlock visitorWithEnterBlock:^(HTMLNode * node) {
+        if (scope == HTMLSerializationScopeChildrenOnly && node == self->_root) {
+			return;
+		}
+
+        if (self->_ignore > 0) {
+			return;
+		}
+
+		switch (node.nodeType) {
+			case HTMLNodeElement:
+				[self openElement:node.asElement];
+				break;
+			case HTMLNodeComment:
+				[self serializeComment:node.asComment];
+				break;
+			case HTMLNodeText:
+				[self serializeText:node.asText];
+				break;
+			case HTMLNodeDocumentFragment:
+				[self serializeDocumentType:node.asDocumentType];
+				break;
+			default:
+				break;
+		}
+	} leaveBlock:^(HTMLNode * _Nonnull node) {
+        if (scope == HTMLSerializationScopeChildrenOnly && node == self->_root) {
+			return;
+		}
+
+		switch (node.nodeType) {
+			case HTMLNodeElement:
+				if ([node.asElement.tagName isEqualToAny:@"area", @"base", @"basefont", @"bgsound", @"br", @"col", @"embed",
+					 @"frame", @"hr", @"img", @"input", @"keygen", @"link", @"menuitem", @"meta", @"param", @"source",
+					 @"track", @"wbr", nil]) {
+                    self->_ignore--;
+					break;
+				}
+				[self closeElement:node.asElement];
+			default:
+				break;
+		}
+	}];
+
+	[_treeVisitor walkWithNodeVisitor:nodeVisitor];
+	return [_result copy];
+}
+
+- (void)openElement:(HTMLElement *)element
+{
+	[_result appendFormat:@"<%@", element.tagName];
+	[element.attributes enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *value, BOOL *stop) {
+		NSMutableString *escaped = [value mutableCopy];
+		[escaped replaceOccurrencesOfString:@"&" withString:@"&amp;" options:0 range:NSMakeRange(0, escaped.length)];
+		[escaped replaceOccurrencesOfString:@"0x00A0" withString:@"&nbsp;" options:0 range:NSMakeRange(0, escaped.length)];
+		[escaped replaceOccurrencesOfString:@"\"" withString:@"&quot;" options:0 range:NSMakeRange(0, escaped.length)];
+
+		[_result appendFormat:@" %@=\"%@\"", key, escaped];
+	}];
+
+	[_result appendString:@">"];
+
+	if ([element.tagName isEqualToAny:@"area", @"base", @"basefont", @"bgsound", @"br", @"col", @"embed",
+		 @"frame", @"hr", @"img", @"input", @"keygen", @"link", @"menuitem", @"meta", @"param", @"source",
+		 @"track", @"wbr", nil]) {
+		_ignore++;
+	}
+}
+
+- (void)closeElement:(HTMLElement *)element
+{
+	[_result appendFormat:@"</%@>", element.tagName];
+}
+
+- (void)serializeText:(HTMLText *)text
+{
+	if ([text.parentElement.tagName isEqualToAny:@"style", @"script", @"xmp", @"iframe", @"noembed", @"noframes",
+		 @"plaintext", @"noscript", nil]) {
+		[_result appendString:text.data];
+	} else {
+		NSMutableString *escaped = [text.data mutableCopy];
+		[escaped replaceOccurrencesOfString:@"&" withString:@"&amp;" options:0 range:NSMakeRange(0, escaped.length)];
+		[escaped replaceOccurrencesOfString:@"\00A0" withString:@"&nbsp;" options:0 range:NSMakeRange(0, escaped.length)];
+		[escaped replaceOccurrencesOfString:@"<" withString:@"&lt;" options:0 range:NSMakeRange(0, escaped.length)];
+		[escaped replaceOccurrencesOfString:@">" withString:@"&gt;" options:0 range:NSMakeRange(0, escaped.length)];
+		[_result appendString:escaped];
+	}
+}
+
+- (void)serializeComment:(HTMLComment *)comment
+{
+	[_result appendFormat:@"<!--%@-->", comment.data];
+}
+
+- (void)serializeDocumentType:(HTMLDocumentType *)doctype
+{
+	[_result appendFormat:@"<!DOCTYPE %@>", doctype.name];
+}
+
+@end

Sources/HTMLStackOfOpenElements.m

@@ -14,7 +14,6 @@
 @interface HTMLStackOfOpenElements ()
 {
 	NSMutableArray *_stack;
-	NSDictionary *_specificScopeElementTypes;
 }
 @end
 
@@ -27,26 +26,6 @@
 	self = [super init];
 	if (self) {
 		_stack = [NSMutableArray new];
-		_specificScopeElementTypes = @{
-									   @"applet": @(HTMLNamespaceHTML),
-									   @"caption": @(HTMLNamespaceHTML),
-									   @"html": @(HTMLNamespaceHTML),
-									   @"table": @(HTMLNamespaceHTML),
-									   @"td": @(HTMLNamespaceHTML),
-									   @"th": @(HTMLNamespaceHTML),
-									   @"marquee": @(HTMLNamespaceHTML),
-									   @"object": @(HTMLNamespaceHTML),
-									   @"template": @(HTMLNamespaceHTML),
-									   @"mi": @(HTMLNamespaceMathML),
-									   @"mo": @(HTMLNamespaceMathML),
-									   @"mn": @(HTMLNamespaceMathML),
-									   @"ms": @(HTMLNamespaceMathML),
-									   @"mtext": @(HTMLNamespaceMathML),
-									   @"annotation-xml": @(HTMLNamespaceMathML),
-									   @"foreignObject": @(HTMLNamespaceSVG),
-									   @"desc": @(HTMLNamespaceSVG),
-									   @"title": @(HTMLNamespaceSVG)
-									   };
 	}
 	return self;
 }
@@ -195,82 +174,148 @@
 
 #pragma mark - Element Scope
 
+NS_INLINE BOOL IsSpecificScopeElement(HTMLElement *element)
+{
+	switch (element.htmlNamespace) {
+		case HTMLNamespaceHTML:
+			return [element.tagName isEqualToAny:@"applet", @"caption", @"html", @"table", @"td", @"th", @"marquee", @"object", @"template", nil];
+		case HTMLNamespaceMathML:
+			return [element.tagName isEqualToAny:@"mi", @"mo", @"mn", @"ms", @"mtext", @"annotation-xml", nil];
+		case HTMLNamespaceSVG:
+			return [element.tagName isEqualToAny:@"foreignObject", @"desc", @"title", nil];
+	}
+}
+
+NS_INLINE BOOL IsHeaderElement(HTMLElement *element)
+{
+	if (element.htmlNamespace != HTMLNamespaceHTML) {
+		return NO;
+	}
+
+	return [element.tagName isEqualToAny:@"h1", @"h2", @"h3", @"h4", @"h5", @"h6", nil];
+}
+
+NS_INLINE BOOL IsTableScopeElement(HTMLElement *element)
+{
+	if (element.htmlNamespace != HTMLNamespaceHTML) {
+		return NO;
+	}
+
+	return [element.tagName isEqualToAny:@"html", @"table", @"template", nil];
+}
+
+NS_INLINE BOOL IsListItemScopeElement(HTMLElement *element)
+{
+	if (element.htmlNamespace != HTMLNamespaceHTML) {
+		return NO;
+	}
+
+	return [element.tagName isEqualToAny:@"ol", @"ul", nil];
+}
+
+NS_INLINE BOOL IsSelectScopeElement(HTMLElement *element)
+{
+	if (element.htmlNamespace != HTMLNamespaceHTML) {
+		return NO;
+	}
+
+	return ![element.tagName isEqualToString:@"optgroup"] && ![element.tagName isEqualToString:@"option"];
+}
+
+NS_INLINE BOOL IsButtonScopeElement(HTMLElement *element)
+{
+	if (element.htmlNamespace != HTMLNamespaceHTML) {
+		return NO;
+	}
+
+	return [element.tagName isEqualToString:@"button"];
+}
+
 - (HTMLElement *)hasElementInScopeWithTagName:(NSString *)tagName;
-{
-	return [self hasAnyElementInSpecificScopeWithTagNames:@[tagName] andElementTypes:_specificScopeElementTypes];
-}
-
-- (HTMLElement *)hasAnyElementInScopeWithAnyOfTagNames:(NSArray *)tagNames
-{
-	return [self hasAnyElementInSpecificScopeWithTagNames:tagNames andElementTypes:_specificScopeElementTypes];
-}
-
-- (HTMLElement *)hasElementInListItemScopeWithTagName:(NSString *)tagName
-{
-	NSMutableDictionary *elementTypes = [NSMutableDictionary dictionaryWithDictionary:_specificScopeElementTypes];
-	[elementTypes addEntriesFromDictionary:@{@"ol": @(HTMLNamespaceHTML),
-											 @"ul": @(HTMLNamespaceHTML)}];
-
-	return [self hasElementInSpecificScopeWithTagName:tagName
-									  andElementTypes:elementTypes];
-}
-
-- (HTMLElement *)hasElementInButtonScopeWithTagName:(NSString *)tagName
-{
-	NSMutableDictionary *elementTypes = [NSMutableDictionary dictionaryWithDictionary:_specificScopeElementTypes];
-	[elementTypes addEntriesFromDictionary:@{@"button": @(HTMLNamespaceHTML)}];
-
-	return [self hasElementInSpecificScopeWithTagName:tagName
-									  andElementTypes:elementTypes];
-}
-
-- (HTMLElement *)hasElementInTableScopeWithTagName:(NSString *)tagName
-{
-	return [self hasElementInSpecificScopeWithTagName:tagName
-									  andElementTypes:@{@"html": @(HTMLNamespaceHTML),
-														@"table": @(HTMLNamespaceHTML),
-														@"template": @(HTMLNamespaceHTML)}];
-}
-
-- (HTMLElement *)hasElementInTableScopeWithAnyOfTagNames:(NSArray *)tagNames
-{
-	return [self hasAnyElementInSpecificScopeWithTagNames:tagNames
-										  andElementTypes:@{@"html": @(HTMLNamespaceHTML),
-															@"table": @(HTMLNamespaceHTML),
-															@"template": @(HTMLNamespaceHTML)}];
-}
-
-- (HTMLElement *)hasElementInSelectScopeWithTagName:(NSString *)tagName
 {
 	for (HTMLElement *node in _stack.reverseObjectEnumerator) {
-		if ([node.tagName isEqualToString:tagName]) {
+		if (node.htmlNamespace == HTMLNamespaceHTML && [tagName isEqualToString:node.tagName]) {
 			return node;
 		}
-		if (!(node.htmlNamespace == HTMLNamespaceHTML &&
-			  [node.tagName isEqualToAny:@"optgroup", @"option", nil])) {
+		if (IsSpecificScopeElement(node)) {
 			return nil;
 		}
 	}
 	return nil;
 }
 
-- (HTMLElement *)hasElementInSpecificScopeWithTagName:(NSString *)tagName
-									  andElementTypes:(NSDictionary *)elementTypes
-{
-	return [self hasAnyElementInSpecificScopeWithTagNames:@[tagName] andElementTypes:elementTypes];
-}
-
-- (HTMLElement *)hasAnyElementInSpecificScopeWithTagNames:(NSArray *)tagNames
-										  andElementTypes:(NSDictionary *)elementTypes
+- (HTMLElement *)hasHeaderElementInScope
 {
 	for (HTMLElement *node in _stack.reverseObjectEnumerator) {
-		if ([tagNames containsObject:node.tagName]) {
-			NSNumber *namespace = elementTypes[node.tagName] ?: @(HTMLNamespaceHTML);
-			if ([namespace isEqual:@(node.htmlNamespace)]) {
-				return node;
-			}
+		if (IsHeaderElement(node)) {
+			return node;
 		}
-		if ([elementTypes[node.tagName] isEqual:@(node.htmlNamespace)]) {
+		if (IsSpecificScopeElement(node)) {
+			return nil;
+		}
+	}
+	return nil;
+}
+
+- (HTMLElement *)hasElementInTableScopeWithTagName:(NSString *)tagName
+{
+	for (HTMLElement *node in _stack.reverseObjectEnumerator) {
+		if (node.htmlNamespace == HTMLNamespaceHTML && [tagName isEqualToString:node.tagName]) {
+			return node;
+		}
+		if (IsTableScopeElement(node)) {
+			return nil;
+		}
+	}
+	return nil;
+}
+
+- (HTMLElement *)hasElementInTableScopeWithAnyOfTagNames:(NSArray *)tagNames
+{
+	for (HTMLElement *node in _stack.reverseObjectEnumerator) {
+		if (node.htmlNamespace == HTMLNamespaceHTML && [tagNames containsObject:node.tagName]) {
+			return node;
+		}
+		if (IsTableScopeElement(node)) {
+			return nil;
+		}
+	}
+	return nil;
+}
+
+- (HTMLElement *)hasElementInListItemScopeWithTagName:(NSString *)tagName
+{
+	for (HTMLElement *node in _stack.reverseObjectEnumerator) {
+		if (node.htmlNamespace == HTMLNamespaceHTML && [tagName isEqualToString:node.tagName]) {
+			return node;
+		}
+		if (IsSpecificScopeElement(node) || IsListItemScopeElement(node)) {
+			return nil;
+		}
+	}
+	return nil;
+}
+
+- (HTMLElement *)hasElementInButtonScopeWithTagName:(NSString *)tagName
+{
+	for (HTMLElement *node in _stack.reverseObjectEnumerator) {
+		if (node.htmlNamespace == HTMLNamespaceHTML && [tagName isEqualToString:node.tagName]) {
+			return node;
+		}
+		if (IsSpecificScopeElement(node) || IsButtonScopeElement(node)) {
+			return nil;
+		}
+	}
+	return nil;
+}
+
+- (HTMLElement *)hasElementInSelectScopeWithTagName:(NSString *)tagName
+{
+	for (HTMLElement *node in _stack.reverseObjectEnumerator) {
+		if (node.htmlNamespace == HTMLNamespaceHTML && [tagName isEqualToString:node.tagName]) {
+			return node;
+		}
+		if (IsSelectScopeElement(node)) {
 			return nil;
 		}
 	}

Sources/HTMLText.m

@@ -8,7 +8,7 @@
 
 #import "HTMLText.h"
 #import "HTMLElement.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 #import "HTMLCharacterData+Private.h"
 #import "HTMLKitDOMExceptions.h"
 #import "HTMLDocument+Private.h"
@@ -66,24 +66,6 @@ NS_INLINE void CheckValidOffset(HTMLNode *node, NSUInteger offset, NSString *cmd
 	return newNode;
 }
 
-#pragma mark - Serialization
-
-- (NSString *)outerHTML
-{
-	if ([self.parentElement.tagName isEqualToAny:@"style", @"script", @"xmp", @"iframe", @"noembed", @"noframes",
-		 @"plaintext", @"noscript", nil]) {
-		return self.data;
-	} else {
-		NSRange range = NSMakeRange(0, self.data.length);
-		NSMutableString *escaped = [self.data mutableCopy];
-		[escaped replaceOccurrencesOfString:@"&" withString:@"&" options:0 range:range];
-		[escaped replaceOccurrencesOfString:@"\00A0" withString:@" " options:0 range:range];
-		[escaped replaceOccurrencesOfString:@"<" withString:@"&lt;" options:0 range:range];
-		[escaped replaceOccurrencesOfString:@">" withString:@"&gt;" options:0 range:range];
-		return escaped;
-	}
-}
-
 #pragma mark - Description
 
 - (NSString *)description

Sources/HTMLTreeVisitor.m

@@ -0,0 +1,63 @@
+//
+//  HTMLTreeVisitor.m
+//  HTMLKit
+//
+//  Created by Iska on 30.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import "HTMLTreeVisitor.h"
+#import "HTMLNode.h"
+#import "HTMLTreeWalker.h"
+
+@interface HTMLTreeVisitor()
+{
+	HTMLNode *_root;
+	HTMLTreeWalker *_treeWalker;
+}
+@end
+
+@implementation HTMLTreeVisitor
+
+- (instancetype)initWithNode:(HTMLNode *)node
+{
+	self = [super init];
+	if (self) {
+		_root = node;
+		_treeWalker = [[HTMLTreeWalker alloc] initWithNode:node];
+	}
+	return self;
+}
+
+- (void)walkWithNodeVisitor:(id<HTMLNodeVisitor>)visitor
+{
+	HTMLNode *currentNode = _treeWalker.currentNode;
+	while (currentNode) {
+		[visitor enter:currentNode];
+		if (currentNode.hasChildNodes) {
+			currentNode = [_treeWalker firstChild];
+			continue;
+		}
+
+		HTMLNode *next = [_treeWalker nextSibling];
+		if (next) {
+			[visitor leave:currentNode];
+			currentNode = next;
+			continue;
+		}
+
+		while (!next && _treeWalker.currentNode != _root) {
+			[visitor leave:_treeWalker.currentNode];
+			currentNode = [_treeWalker parentNode];
+			next = [_treeWalker nextSibling];
+		}
+		[visitor leave:currentNode];
+		currentNode = _treeWalker.currentNode;
+
+		if (currentNode == _root) {
+			break;
+		}
+	}
+}
+
+@end

Sources/NSCharacterSet+HTMLKit.m

@@ -10,7 +10,7 @@
 
 @implementation NSCharacterSet (HTMLKit)
 
-+ (instancetype)HTMLWhitespaceCharacterSet
++ (instancetype)htmlkit_HTMLWhitespaceCharacterSet
 {
 	static NSCharacterSet *set = nil;
 	static dispatch_once_t onceToken;
@@ -20,7 +20,7 @@
 	return set;
 }
 
-+ (instancetype)HTMLHexNumberCharacterSet
++ (instancetype)htmlkit_HTMLHexNumberCharacterSet
 {
 	static NSCharacterSet *set = nil;
 	static dispatch_once_t onceToken;
@@ -30,7 +30,7 @@
 	return set;
 }
 
-+ (instancetype)CSSNthExpressionCharacterSet
++ (instancetype)htmlkit_CSSNthExpressionCharacterSet
 {
 	static NSCharacterSet *set = nil;
 	static dispatch_once_t onceToken;

Sources/NSString+HTMLKit.m

@@ -15,37 +15,12 @@ NS_INLINE BOOL isHtmlWhitespaceChar(unichar c)
 
 @implementation NSString (HTMLKit)
 
-- (BOOL)isEqualToStringIgnoringCase:(NSString *)aString
+- (BOOL)htmlkit_isHTMLWhitespaceString
 {
-	return [self caseInsensitiveCompare:aString] == NSOrderedSame;
+	return self.htmlkit_leadingHTMLWhitespaceLength == self.length;
 }
 
-- (BOOL)isEqualToAny:(NSString *)first, ... NS_REQUIRES_NIL_TERMINATION
-{
-	va_list list;
-	va_start(list, first);
-	for (NSString *next = first; next != nil; next = va_arg(list, NSString *)) {
-		if ([self isEqualToString:next]) {
-			return YES;
-		}
-	}
-	va_end(list);
-	return NO;
-}
-
-- (BOOL)hasPrefixIgnoringCase:(NSString *)aString
-{
-	NSRange reange = [self rangeOfString:aString
-								 options:NSAnchoredSearch|NSCaseInsensitiveSearch];
-	return reange.location != NSNotFound;
-}
-
-- (BOOL)isHTMLWhitespaceString
-{
-	return self.leadingHTMLWhitespaceLength == self.length;
-}
-
-- (NSUInteger)leadingHTMLWhitespaceLength
+- (NSUInteger)htmlkit_leadingHTMLWhitespaceLength
 {
 	size_t idx = 0;
 	NSUInteger length = self.length;

Sources/NSString+Private.m

@@ -0,0 +1,38 @@
+//
+//  NSString+Private.m
+//  HTMLKit
+//
+//  Created by Iska on 26.03.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import "NSString+Private.h"
+
+@implementation NSString (Private)
+
+- (BOOL)isEqualToStringIgnoringCase:(NSString *)aString
+{
+	return [self caseInsensitiveCompare:aString] == NSOrderedSame;
+}
+
+- (BOOL)isEqualToAny:(NSString *)first, ... NS_REQUIRES_NIL_TERMINATION
+{
+	va_list list;
+	va_start(list, first);
+	for (NSString *next = first; next != nil; next = va_arg(list, NSString *)) {
+		if ([self isEqualToString:next]) {
+			return YES;
+		}
+	}
+	va_end(list);
+	return NO;
+}
+
+- (BOOL)hasPrefixIgnoringCase:(NSString *)aString
+{
+	NSRange reange = [self rangeOfString:aString
+								 options:NSAnchoredSearch|NSCaseInsensitiveSearch];
+	return reange.location != NSNotFound;
+}
+
+@end

Sources/include/CSSPseudoFunctionSelector.h

@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  Initializes and returns a CSS has-descendant selector, e.g. 'div:has(p)'
 
- @discussion 'div:has(p)' matches all <div> elements which have a descendant <p> element.
+ @discussion 'div:has(p)' matches all &lt;div&gt; elements which have a descendant &lt;p&gt; element.
 
  @param selector The selector matching a descendant element.
  @return A new instance of the has-descendant selector.

Sources/include/CSSSelector.h

@@ -76,7 +76,7 @@ extern NSString * _Nonnull NSStringFromNthExpression(CSSNthExpression expression
  @param string The selector string which will be parsed.
  @return A new instance of a parsed CSS Selector, `nil` if the string is not a valid selector string.
  */
-+ (nullable instancetype)selectorWithString:(NSString *)stirng;
++ (nullable instancetype)selectorWithString:(NSString *)string;
 
 /**
  Implementations should override this method to provide the selector-sprecific logic for matching elements.

Sources/include/CSSSelectors.h

@@ -26,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 
  @return The universal CSS selector.
  */
-extern CSSSelector * universalSelector();
+extern CSSSelector * universalSelector(void);
 
 /**
  CSS type selector, e.g. 'div', 'p', ...etc.
@@ -125,7 +125,7 @@ extern CSSSelector * nthLastOfTypeSelector(CSSNthExpression expression);
 
  @return Odd-Child selector.
  */
-extern CSSSelector * oddSelector();
+extern CSSSelector * oddSelector(void);
 
 /**
  CSS even-child selector: ':nth-child(even)'
@@ -134,49 +134,49 @@ extern CSSSelector * oddSelector();
 
  @return Even-Child selector.
  */
-extern CSSSelector * evenSlector();
+extern CSSSelector * evenSlector(void);
 
 /**
  CSS first-child selector: ':nth-child(1)'
 
  @return First-Child selector.
  */
-extern CSSSelector * firstChildSelector();
+extern CSSSelector * firstChildSelector(void);
 
 /**
  CSS first-child selector: ':nth-last-child(1)'
 
  @return First-Child selector.
  */
-extern CSSSelector * lastChildSelector();
+extern CSSSelector * lastChildSelector(void);
 
 /**
  CSS first-of-type selector: ':nth-first-of-type(1)'
 
  @return First-Of-Type selector.
  */
-extern CSSSelector * firstOfTypeSelector();
+extern CSSSelector * firstOfTypeSelector(void);
 
 /**
  CSS last-of-type selector: ':nth-last-of-type(1)'
 
  @return Last-Of-Type selector.
  */
-extern CSSSelector * lastOfTypeSelector();
+extern CSSSelector * lastOfTypeSelector(void);
 
 /**
  CSS only-child selector: ':first-child:last-child'
 
  @return Only-Child selector.
  */
-extern CSSSelector * onlyChildSelector();
+extern CSSSelector * onlyChildSelector(void);
 
 /**
  CSS only-of-type selector: ':first-of-type:last-of-type'
 
  @return Only-Of-Type selector.
  */
-extern CSSSelector * onlyOfTypeSelector();
+extern CSSSelector * onlyOfTypeSelector(void);
 
 #pragma mark - Combinators
 
@@ -225,7 +225,7 @@ extern CSSSelector * not(CSSSelector *selector);
 /**
  CSS has-descendant selector, e.g. 'div:has(p)'
 
- @discussion 'div:has(p)' matches all <div> elements which have a descendant <p> element.
+ @discussion 'div:has(p)' matches all &lt;div&gt; elements which have a descendant &lt;p&gt; element.
 
  @param selector The selector matching a descendant element.
  @return A has-descendant selector.

Sources/include/CSSStructuralPseudoSelectors.h

@@ -15,102 +15,102 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  @return Root element selector: ':root'
  */
-extern CSSSelector * rootSelector();
+extern CSSSelector * rootSelector(void);
 
 /**
  @return Empy element selector: ':empty'
  */
-extern CSSSelector * emptySelector();
+extern CSSSelector * emptySelector(void);
 
 /**
  @return A parent element selector: ':parent'
  */
-extern CSSSelector * parentSelector();
+extern CSSSelector * parentSelector(void);
 
 /**
  @return A button element selector: ':button'
  */
-extern CSSSelector * buttonSelector();
+extern CSSSelector * buttonSelector(void);
 
 /**
  @return A checkbox element selector: ':checkbox'
  */
-extern CSSSelector * checkboxSelector();
+extern CSSSelector * checkboxSelector(void);
 
 /**
  @return A file element selector: ':file'
  */
-extern CSSSelector * fileSelector();
+extern CSSSelector * fileSelector(void);
 
 /**
  @return A header element selector: ':header'
  */
-extern CSSSelector * headerSelector();
+extern CSSSelector * headerSelector(void);
 
 /**
  @return An image element selector: ':image'
  */
-extern CSSSelector * imageSelector();
+extern CSSSelector * imageSelector(void);
 
 /**
  @return A parent element selector: ':parent'
  */
-extern CSSSelector * inputSelector();
+extern CSSSelector * inputSelector(void);
 
 /**
  @return A link element selector: ':link'
  */
-extern CSSSelector * linkSelector();
+extern CSSSelector * linkSelector(void);
 
 /**
  @return A password element selector: ':password'
  */
-extern CSSSelector * passwordSelector();
+extern CSSSelector * passwordSelector(void);
 
 /**
  @return A radio element selector: ':radio'
  */
-extern CSSSelector * radioSelector();
+extern CSSSelector * radioSelector(void);
 
 /**
  @return A reset element selector: ':reset'
  */
-extern CSSSelector * resetSelector();
+extern CSSSelector * resetSelector(void);
 
 /**
  @return A submit element selector: ':submit'
  */
-extern CSSSelector * submitSelector();
+extern CSSSelector * submitSelector(void);
 
 /**
  @return A text element selector: ':text'
  */
-extern CSSSelector * textSelector();
+extern CSSSelector * textSelector(void);
 
 /**
  @return An enabled element selector: ':enabled'
  */
-extern CSSSelector * enabledSelector();
+extern CSSSelector * enabledSelector(void);
 
 /**
  @return A disabled element selector: ':disabled'
  */
-extern CSSSelector * disabledSelector();
+extern CSSSelector * disabledSelector(void);
 
 /**
  @return A checked element selector: ':checked'
  */
-extern CSSSelector * checkedSelector();
+extern CSSSelector * checkedSelector(void);
 
 /**
  @return An optional element selector: ':optional'
  */
-extern CSSSelector * optionalSelector();
+extern CSSSelector * optionalSelector(void);
 
 /**
  @return A required element selector: ':required'
  */
-extern CSSSelector * requiredSelector();
+extern CSSSelector * requiredSelector(void);
 
 /**
  Less-than selector, e.g. 'lt(2)'

Sources/include/HTMLComment.h

@@ -15,6 +15,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface HTMLComment : HTMLCharacterData
 
+/**
+Decalration override for `NS_UNAVAILABLE` declared in `HTMLNode`
+*/
+- (instancetype)init;
+
 /**
  Initializes a new HTML comment node.
 

Sources/include/HTMLCommentToken.h

@@ -24,7 +24,7 @@
 /**
  Initializes a new comment token.
 
- @param string The string with which to initialize the token.
+ @param data The string with which to initialize the token.
  @return A new instance of a comment token.
  */
 - (instancetype)initWithData:(NSString *)data;

Sources/include/HTMLDOM.h

@@ -18,9 +18,12 @@
 #import "HTMLRange.h"
 #import "HTMLDOMTokenList.h"
 #import "HTMLNodeIterator.h"
+#import "HTMLTreeVisitor.h"
 #import "HTMLTreeWalker.h"
 #import "HTMLNodeFilter.h"
 
 #import "HTMLKitDOMExceptions.h"
 #import "HTMLNamespaces.h"
 #import "HTMLQuirksMode.h"
+
+#import "HTMLOrderedDictionary.h"

Sources/include/HTMLDocument.h

@@ -78,6 +78,11 @@ typedef NS_ENUM(short, HTMLDocumentReadyState)
  */
 + (instancetype)documentWithString:(NSString *)string;
 
+/**
+Decalration override for `NS_UNAVAILABLE` declared in `HTMLNode`
+*/
+- (instancetype)init;
+
 /**
  Adopts a given node into this document, i.e. the document becomes the new owner of the node. Raises a HTMLKitNotSupportedError
  exception if node is an instance of HTMLDocument.

Sources/include/HTMLDocumentFragment.h

@@ -18,6 +18,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface HTMLDocumentFragment : HTMLNode
 
+/**
+Decalration override for `NS_UNAVAILABLE` declared in `HTMLNode`
+*/
+- (instancetype)init;
+
 /**
  Initializes a new document fragment with the given document as owner.
  

Sources/include/HTMLDocumentType.h

@@ -31,6 +31,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, copy, readonly) NSString *systemIdentifier;
 
+/**
+Decalration override for `NS_UNAVAILABLE` declared in `HTMLNode`
+*/
+- (instancetype)init;
+
 /**
  Initializes and returns a new isntance of a Document Type node.
 

Sources/include/HTMLElement.h

@@ -63,7 +63,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  Initializes a new HTML element with the given tag name.
  
- @param tagname The tag name.
+ @param tagName The tag name.
  @return A new HTML element.
  */
 - (instancetype)initWithTagName:(NSString *)tagName;
@@ -71,21 +71,21 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  Initializes a new HTML element with the given tag name and attributes.
 
- @param tagname The tag name.
+ @param tagName The tag name.
  @param attributes The attributes.
  @return A new HTML element.
  */
-- (instancetype)initWithTagName:(NSString *)tagName attributes:(NSDictionary<NSString *, NSString *> *)attributes;
+- (instancetype)initWithTagName:(NSString *)tagName attributes:(nullable NSDictionary<NSString *, NSString *> *)attributes;
 
 /**
  Initializes a new HTML element with the given tag name, namespace, and attributes.
 
- @param tagname The tag name.
- @param namespace The namespace.
+ @param tagName The tag name.
+ @param htmlNamespace The HTML namespace.
  @param attributes The attributes.
  @return A new HTML element.
  */
-- (instancetype)initWithTagName:(NSString *)tagName namespace:(HTMLNamespace)htmlNamespace attributes:(NSDictionary<NSString *, NSString *> *)attributes;
+- (instancetype)initWithTagName:(NSString *)tagName namespace:(HTMLNamespace)htmlNamespace attributes:(nullable NSDictionary<NSString *, NSString *> *)attributes;
 
 /**
  Checks whether this element has an attribute with the given name.
@@ -107,7 +107,7 @@ NS_ASSUME_NONNULL_BEGIN
  Set the value of the attribute with the given name.
 
  @param value The value to set.
- @param name The attribute's name.
+ @param attribute The attribute's name.
  */
 - (void)setObject:(NSString *)value forKeyedSubscript:(NSString *)attribute;
 

Sources/include/HTMLElementAdjustment.h

@@ -140,31 +140,3 @@ NS_INLINE void AdjustSVGNameCase(HTMLTagToken *token)
 	NSString *replacement = replacements[token.tagName] ?: token.tagName;
 	token.tagName = replacement;
 }
-
-NS_INLINE void AdjustForeignAttributes(HTMLTagToken *token)
-{
-	if (token.attributes == nil) {
-		return;
-	}
-
-	NSDictionary *replacements = @{ @"xlink:actuate": @"xlink actuate",
-									@"xlink:arcrole": @"xlink arcrole",
-									@"xlink:href": @"xlink href",
-									@"xlink:role": @"xlink role",
-									@"xlink:show": @"xlink show",
-									@"xlink:title": @"xlink title",
-									@"xlink:type": @"xlink type",
-									@"xml:base": @"xml base",
-									@"xml:lang": @"xml lang",
-									@"xml:space": @"xml space",
-									@"xmlns": @"xmlns",
-									@"xmlns:xlink": @"xmlns xlink"};
-
-	HTMLOrderedDictionary *adjusted = [HTMLOrderedDictionary new];
-	for (id key in token.attributes) {
-		NSString *replacement = replacements[key] ?: key;
-		adjusted[replacement] = token.attributes[key];
-	}
-	token.attributes = adjusted;
-}
-

Sources/include/HTMLElementTypes.h

@@ -10,9 +10,10 @@
 /// HTMLKit private header
 ///------------------------------------------------------
 
+#import "HTMLNode+Private.h"
 #import	"HTMLElement.h"
 #import "HTMLNamespaces.h"
-#import "NSString+HTMLKit.h"
+#import "NSString+Private.h"
 
 NS_INLINE BOOL IsNodeMathMLTextIntegrationPoint(HTMLElement *node)
 {
@@ -52,3 +53,14 @@ NS_INLINE BOOL IsSpecialElement(HTMLElement *element)
 	}
 	return NO;
 }
+
+NS_INLINE BOOL DoesNodeSerializeAsVoid(HTMLNode *node)
+{
+	if (node.nodeType != HTMLNodeElement) {
+		return false;
+	}
+
+	return [node.asElement.tagName isEqualToAny:@"area", @"base", @"basefont", @"bgsound", @"br", @"col", @"embed",
+			@"frame", @"hr", @"img", @"input", @"keygen", @"link", @"meta", @"param", @"source", @"track", @"wbr", nil];
+}
+

Sources/include/HTMLInputStreamReader.h

@@ -15,9 +15,10 @@
 /** 
  Typedef for the error callback block.
 
- @param reason The string describing the reason of the reported error.
+ @param code The standarized error-code
+ @param details The string describing the reason of the reported error.
  */
-typedef void (^ HTMLStreamReaderErrorCallback)(NSString *reason);
+typedef void (^ HTMLStreamReaderErrorCallback)(NSString *code, NSString *details);
 
 /**
  * HTML Input Stream Reader processor conforming to the HTML standard

Sources/include/HTMLKit.h

@@ -16,6 +16,7 @@ extern const unsigned char HTMLKitVersionString[];
 
 #import "HTMLDOM.h"
 #import "HTMLParser.h"
+#import "HTMLSerializer.h"
 #import "HTMLKitErrorDomain.h"
 #import "HTMLOrderedDictionary.h"
 

Sources/include/HTMLNode+Private.h

@@ -12,6 +12,10 @@
 
 #import "HTMLNode.h"
 
+@class HTMLText;
+@class HTMLComment;
+@class HTMLDocumentType;
+
 /**
  Private HTML Node methods which are not intended for public API.
  */
@@ -44,6 +48,21 @@
  */
 - (HTMLElement *)asElement;
 
+/**
+ Casts this node to a HTML Text. This cast should only be performed after the appropriate check.
+ */
+- (HTMLText *)asText;
+
+/**
+ Casts this node to a HTML Comment. This cast should only be performed after the appropriate check.
+ */
+- (HTMLComment *)asComment;
+
+/**
+ Casts this node to a HTML Document Type. This cast should only be performed after the appropriate check.
+ */
+- (HTMLDocumentType *)asDocumentType;
+
 /**
  Returns the same string representation of the DOM tree rooted at this node that is used by html5lib-tests.
  

Sources/include/HTMLNode.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "HTMLNodeIterator.h"
+#import "HTMLTreeVisitor.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -232,7 +233,7 @@ typedef NS_OPTIONS(unsigned short, HTMLDocumentPosition)
 /**
  Returns the index of the given child element in the set of child nodes.
 
- @param node The element.
+ @param element The element.
  @return The index of the given element in the children set.
  */
 - (NSUInteger)indexOfChildElement:(HTMLElement *)element;
@@ -248,7 +249,7 @@ typedef NS_OPTIONS(unsigned short, HTMLDocumentPosition)
 /**
  Prepends the given array of nodes to the set of child nodes.
 
- @param node The nodes to prepend.
+ @param nodes The nodes to prepend.
  */
 - (void)prependNodes:(NSArray<HTMLNode *> *)nodes;
 

Sources/include/HTMLNodeVisitor.h

@@ -0,0 +1,59 @@
+//
+//  HTMLNodeVisitor.h
+//  HTMLKit
+//
+//  Created by Iska on 30.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class HTMLNode;
+
+#pragma mark - Node Visitor
+
+/**
+ A HTML Node Visitor which can be used with a tree visitor.
+
+ @see HTMLTreeVisitor
+ */
+@protocol HTMLNodeVisitor <NSObject>
+@required
+
+/**
+ Called when visiting the node for the first time
+
+ @param node The node that is beaing visited for the first time.
+ */
+- (void)enter:(HTMLNode *)node;
+
+/**
+ Called when leaving a previously entered node, i.e. when all its child nodes are visited.
+
+ @param node The node that beaing leaved.
+ */
+- (void)leave:(HTMLNode *)node;
+
+@end
+
+#pragma mark - Block Node Visitor
+
+/**
+ A concrete block-based HTML Node Visitor implementation.
+ */
+@interface HTMLNodeVisitorBlock : NSObject <HTMLNodeVisitor>
+
+/**
+ Initializes and returns a new instance of this visitor.
+
+ @param enterBlock The block to apply on entering a visited node.
+ @param leaveBlock The block to apply on leaving a visited node.
+ */
++ (instancetype)visitorWithEnterBlock:(void (^)(HTMLNode *node))enterBlock
+						   leaveBlock:(void (^)(HTMLNode *node))leaveBlock;
+
+@end
+
+NS_ASSUME_NONNULL_END

Sources/include/HTMLParseErrorToken.h

@@ -18,19 +18,22 @@
  */
 @interface HTMLParseErrorToken : HTMLToken
 
-/** @brief The error's reason message. */
-@property (nonatomic, copy) NSString *reason;
+/** @brief The parse error's code as specified at https://html.spec.whatwg.org/multipage/parsing.html#parse-errors. */
+@property (nonatomic, strong, readonly) NSString *code;
+
+/** @brief Additional detailed error information. */
+@property (nonatomic, strong, readonly) NSString *details;
 
 /** @brief The error's location in the stream. */
-@property (nonatomic, assign) NSUInteger location;
+@property (nonatomic, assign, readonly) NSUInteger location;
 
 /**
  Initializes a new Parse Error token.
 
- @param reason The error's reason message.
+ @param code The parse error's as specified at https://html.spec.whatwg.org/multipage/parsing.html#parse-errors.
  @param location The error's location in the stream.
  @return A new instance of a parse error token.
  */
-- (instancetype)initWithReasonMessage:(NSString *)reason andStreamLocation:(NSUInteger)location;
+- (instancetype)initWithCode:(NSString *)code details:(NSString *)details location:(NSUInteger)location;
 
 @end

Sources/include/HTMLQuirksMode.h

@@ -6,8 +6,6 @@
 //  Copyright (c) 2015 BrainCookie. All rights reserved.
 //
 
-#import "NSString+HTMLKit.h"
-
 /**
  HTML quirks modes
  https://html.spec.whatwg.org/multipage/infrastructure.html#quirks-mode
@@ -82,12 +80,4 @@ static NSString * HTMLQuirksModePrefixes[] = {
 #undef QUIRKS_ENTRY
 };
 
-NS_INLINE BOOL QuirksModePrefixMatch(NSString *publicIdentifier)
-{
-	for (int i = 0; i < sizeof(HTMLQuirksModePrefixes) / sizeof(HTMLQuirksModePrefixes[0]); i++) {
-		if ([publicIdentifier hasPrefixIgnoringCase:HTMLQuirksModePrefixes[i]]) {
-			return YES;
-		}
-	}
-	return NO;
-}
+extern BOOL QuirksModePrefixMatch(NSString *publicIdentifier);

Sources/include/HTMLRange.h

@@ -81,7 +81,12 @@ typedef NS_ENUM(unsigned short, HTMLRangeComparisonMethod)
  @param document The HTML doucment for which the range will be constructed.
  @return A new HTML Range instance.
  */
-- (instancetype)initWithDowcument:(HTMLDocument *)document;
+- (instancetype)initWithDocument:(HTMLDocument *)document;
+
+/**
+ Deprecated due to typo.
+ */
+- (instancetype)initWithDowcument:(HTMLDocument *)document __attribute__((deprecated("Replaced by -initWithDocument:")));
 
 /**
  Initializes a new range instance for the given document and boundaries.
@@ -93,23 +98,31 @@ typedef NS_ENUM(unsigned short, HTMLRangeComparisonMethod)
  @param endOffset The offset of the end boundary
  @return A new HTML Range instance.
  */
+- (instancetype)initWithDocument:(HTMLDocument *)document
+				  startContainer:(HTMLNode *)startContainer startOffset:(NSUInteger)startOffset
+					endContainer:(HTMLNode *)endContainer endOffset:(NSUInteger)endOffset;
+
+/**
+ Deprecated due to typo.
+ */
 - (instancetype)initWithDowcument:(HTMLDocument *)document
 				   startContainer:(HTMLNode *)startContainer startOffset:(NSUInteger)startOffset
-					 endContainer:(HTMLNode *)endContainer endOffset:(NSUInteger)endOffset;
+					 endContainer:(HTMLNode *)endContainer endOffset:(NSUInteger)endOffset
+	__attribute__((deprecated("Replaced by -initWithDocument:startContainer:startOffset:endContainer:endOffset:")));
 
 /**
  Sets the start boundary.
 
- @param startNode The new node of the start boundary.
- @param startOffset The new offset of the start boundary.
+ @param node The new node of the start boundary.
+ @param offset The new offset of the start boundary.
  */
 - (void)setStartNode:(HTMLNode *)node startOffset:(NSUInteger)offset;
 
 /**
  Sets the end boundary.
 
- @param startNode The new node of the end boundary.
- @param startOffset The new offset of the end boundary.
+ @param node The new node of the end boundary.
+ @param offset The new offset of the end boundary.
  */
 - (void)setEndNode:(HTMLNode *)node endOffset:(NSUInteger)offset;
 

Sources/include/HTMLSerializer.h

@@ -0,0 +1,45 @@
+//
+//  HTMLSerializer.h
+//  HTMLKit
+//
+//  Created by Iska on 28.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class HTMLNode;
+
+/**
+ The scope for HTML Serialization.
+ */
+typedef NS_ENUM(unsigned short, HTMLSerializationScope)
+{
+	HTMLSerializationScopeIncludeRoot = 1,
+	HTMLSerializationScopeChildrenOnly = 2
+};
+
+/**
+ A HTML DOM Serializer. Used to serialize HTML Tree rooted at a given node with the desired scope:
+
+ - IncludeRoot scope includes the given node into the serialized result, e.g. HTML Node's `outerHTML`
+ - ChildrenOnly scope serializes only the child nodes of the given node, e.g. HTML Node's `innerHTML`
+
+ https://html.spec.whatwg.org/multipage/parsing.html#serialising-html-fragments
+ */
+@interface HTMLSerializer : NSObject
+
+/**
+ Serializes the given node with the given scope.
+
+ @param node The root node of the tree to serialize
+ @param scope The scope for serialization
+ */
++ (NSString *)serializeNode:(HTMLNode *)node scope:(HTMLSerializationScope)scope;
+
+@end
+
+NS_ASSUME_NONNULL_END
+

Sources/include/HTMLStackOfOpenElements.h

@@ -79,7 +79,7 @@
 /**
  Checks whether an element with the given tag name is in the stack.
 
- @param tagname The element's tag name.
+ @param tagName The element's tag name.
  @return `YES` if such an element is in the stack, `NO` otherwise.
  */
 - (BOOL)containsElementWithTagName:(NSString *)tagName;
@@ -163,11 +163,11 @@
  https://html.spec.whatwg.org/multipage/syntax.html#has-an-element-in-the-specific-scope
  */
 - (HTMLElement *)hasElementInScopeWithTagName:(NSString *)tagName;
-- (HTMLElement *)hasAnyElementInScopeWithAnyOfTagNames:(NSArray *)tagNames;
-- (HTMLElement *)hasElementInListItemScopeWithTagName:(NSString *)tagName;
-- (HTMLElement *)hasElementInButtonScopeWithTagName:(NSString *)tagName;
+- (HTMLElement *)hasHeaderElementInScope;
 - (HTMLElement *)hasElementInTableScopeWithTagName:(NSString *)tagName;
 - (HTMLElement *)hasElementInTableScopeWithAnyOfTagNames:(NSArray *)tagNames;
+- (HTMLElement *)hasElementInListItemScopeWithTagName:(NSString *)tagName;
+- (HTMLElement *)hasElementInButtonScopeWithTagName:(NSString *)tagName;
 - (HTMLElement *)hasElementInSelectScopeWithTagName:(NSString *)tagName;
 
 /**

Sources/include/HTMLTemplate.h

@@ -18,6 +18,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface HTMLTemplate : HTMLElement
 
+/**
+Decalration override for `NS_UNAVAILABLE` declared in `HTMLNode`
+*/
+- (instancetype)init;
+
 /** 
  The content of the template.
  

Sources/include/HTMLText.h

@@ -15,6 +15,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface HTMLText : HTMLCharacterData
 
+/**
+Decalration override for `NS_UNAVAILABLE` declared in `HTMLNode`
+*/
+- (instancetype)init;
+
 /**
  Initializes a new HTML text node.
 

Sources/include/HTMLTokenizer.h

@@ -16,6 +16,13 @@
 
 @class HTMLParser;
 
+/**
+ Typedef for the parse error callback block.
+
+ @param token The parse error token.
+ */
+typedef void (^ HTMLTokenizerParseErrorCallback)(HTMLParseErrorToken *token);
+
 /**
  * HTML Tokenizer
  * https://html.spec.whatwg.org/multipage/syntax.html#tokenization
@@ -39,6 +46,13 @@
  */
 @property (nonatomic, weak) HTMLParser *parser;
 
+/**
+ An error callback block, which gets called when encountering parse errors while tokenizing the stream
+ 
+ Parse error tokens are dropped if the callback is `nil`.
+ */
+@property (nonatomic, copy) HTMLTokenizerParseErrorCallback parseErrorCallback;
+
 /**
  Initializes a new Tokenizer with the given string.
 

Sources/include/HTMLTokenizerCharacters.h

@@ -23,11 +23,16 @@
 	CHAR( DIGIT_NINE, 0x0039 ) \
 	CHAR( LATIN_CAPITAL_LETTER_A, 0x0041 ) \
 	CHAR( LATIN_CAPITAL_LETTER_F, 0x0046 ) \
+	CHAR( LATIN_CAPITAL_LETTER_P, 0x0050 ) \
+	CHAR( LATIN_CAPITAL_LETTER_S, 0x0053 ) \
 	CHAR( LATIN_CAPITAL_LETTER_X, 0x0058 ) \
 	CHAR( LATIN_CAPITAL_LETTER_Z, 0x005A ) \
+	CHAR( RIGHT_SQUARE_BRACKET, 0x005D ) \
 	CHAR( GRAVE_ACCENT, 0x0060 ) \
 	CHAR( LATIN_SMALL_LETTER_A, 0x0061 ) \
 	CHAR( LATIN_SMALL_LETTER_F, 0x0066 ) \
+	CHAR( LATIN_SMALL_LETTER_P, 0x0070 ) \
+	CHAR( LATIN_SMALL_LETTER_S, 0x0073 ) \
 	CHAR( LATIN_SMALL_LETTER_X, 0x0078 ) \
 	CHAR( LATIN_SMALL_LETTER_Z, 0x007A ) \
 	CHAR( HYPHEN_MINUS, 0x002D ) \
@@ -82,13 +87,17 @@ NUMERIC_REPLACEMENT_CHARACTERS
 #undef CHAR
 };
 
-NS_INLINE BOOL isControlOrUndefinedCharacter(UTF32Char character)
+NS_INLINE BOOL isControlCharacter(unsigned long long character)
 {
 	return ((character >= 0x0001 && character <= 0x0008) ||
-			(character >= 0x000D && character <= 0x001F) ||
-			(character >= 0x007F && character <= 0x009F) ||
-			(character >= 0xFDD0 && character <= 0xFDEF) ||
 			character == 0x000B ||
+			(character >= 0x000E && character <= 0x001F) ||
+			(character >= 0x007F && character <= 0x009F));
+}
+
+NS_INLINE BOOL isNoncharacter(unsigned long long character)
+{
+	return ((character >= 0xFDD0 && character <= 0xFDEF) ||
 			character == 0xFFFE ||
 			character == 0xFFFF ||
 			character == 0x1FFFE ||
@@ -137,6 +146,18 @@ NS_INLINE BOOL isHexDigit(UTF32Char character)
 			(character >= LATIN_SMALL_LETTER_A && character <= LATIN_SMALL_LETTER_F));
 }
 
+NS_INLINE BOOL isUpperHexDigit(UTF32Char character)
+{
+	return ((character >= LATIN_CAPITAL_LETTER_A && character <= LATIN_CAPITAL_LETTER_F) ||
+			(character >= DIGIT_ZERO && character <= DIGIT_NINE));
+}
+
+NS_INLINE BOOL isLowerHexDigit(UTF32Char character)
+{
+	return ((character >= LATIN_SMALL_LETTER_A && character <= LATIN_SMALL_LETTER_F) ||
+			(character >= DIGIT_ZERO && character <= DIGIT_NINE));
+}
+
 NS_INLINE BOOL isAlphanumeric(UTF32Char character)
 {
 	return ((character >= DIGIT_ZERO && character <= DIGIT_NINE) ||
@@ -151,17 +172,14 @@ NS_INLINE BOOL isStringAlphanumeric(NSString *string)
 	return ([string rangeOfCharacterFromSet:set].location == NSNotFound);
 }
 
-NS_INLINE BOOL isInvalidNumericRange(unsigned long long numeric)
+NS_INLINE BOOL isSurrogate(unsigned long long character)
 {
-	return ((numeric >= 0xD800 && numeric <= 0xDFFF) ||
-			numeric > 0x10FFFF);
+	return (character >= 0xD800 && character <= 0xDFFF);
 }
 
 NS_INLINE unichar NumericReplacementCharacter(UTF32Char character)
 {
-	if (character == NULL_CHAR) {
-		return REPLACEMENT_CHAR;
-	} else if (character >= 0x0080 && character <= 0x009F) {
+	if (character >= 0x0080 && character <= 0x009F) {
 		return NumericReplacementTable[character - 0x0080];
 	} else {
 		return NULL_CHAR;

Sources/include/HTMLTokenizerStates.h

@@ -12,9 +12,7 @@
 
 #define TOKENIZER_STATES \
 	STATE_ENTRY( HTMLTokenizerStateData, = 0) \
-	STATE_ENTRY( HTMLTokenizerStateCharacterReferenceInData, ) \
 	STATE_ENTRY( HTMLTokenizerStateRCDATA, ) \
-	STATE_ENTRY( HTMLTokenizerStateCharacterReferenceInRCDATA, ) \
 	STATE_ENTRY( HTMLTokenizerStateRAWTEXT, ) \
 	STATE_ENTRY( HTMLTokenizerStateScriptData, ) \
 	STATE_ENTRY( HTMLTokenizerStatePLAINTEXT, ) \
@@ -59,6 +57,10 @@
 	STATE_ENTRY( HTMLTokenizerStateCommentStart, ) \
 	STATE_ENTRY( HTMLTokenizerStateCommentStartDash, ) \
 	STATE_ENTRY( HTMLTokenizerStateComment, ) \
+	STATE_ENTRY( HTMLTokenizerStateCommentLessThanSign, ) \
+	STATE_ENTRY( HTMLTokenizerStateCommentLessThanSignBang, ) \
+	STATE_ENTRY( HTMLTokenizerStateCommentLessThanSignBangDash, ) \
+	STATE_ENTRY( HTMLTokenizerStateCommentLessThanSignBangDashDash, ) \
 	STATE_ENTRY( HTMLTokenizerStateCommentEndDash, ) \
 	STATE_ENTRY( HTMLTokenizerStateCommentEnd, ) \
 	STATE_ENTRY( HTMLTokenizerStateCommentEndBang, ) \
@@ -78,7 +80,18 @@
 	STATE_ENTRY( HTMLTokenizerStateDOCTYPESystemIdentifierSingleQuoted, ) \
 	STATE_ENTRY( HTMLTokenizerStateAfterDOCTYPESystemIdentifier, ) \
 	STATE_ENTRY( HTMLTokenizerStateBogusDOCTYPE, ) \
-	STATE_ENTRY( HTMLTokenizerStateCDATASection, )
+	STATE_ENTRY( HTMLTokenizerStateCDATASection, ) \
+	STATE_ENTRY( HTMLTokenizerStateCDATASectionBracket, ) \
+	STATE_ENTRY( HTMLTokenizerStateCDATASectionEnd, ) \
+	STATE_ENTRY( HTMLTokenizerStateCharacterReference, ) \
+	STATE_ENTRY( HTMLTokenizerStateNamedCharacterReference, ) \
+	STATE_ENTRY( HTMLTokenizerStateAmbiguousAmpersand, ) \
+	STATE_ENTRY( HTMLTokenizerStateNumericCharacterReference, ) \
+	STATE_ENTRY( HTMLTokenizerStateHexadecimalCharacterReferenceStart, ) \
+	STATE_ENTRY( HTMLTokenizerStateDecimalCharacterReferenceStart, ) \
+	STATE_ENTRY( HTMLTokenizerStateHexadecimalCharacterReference, ) \
+	STATE_ENTRY( HTMLTokenizerStateDecimalCharacterReference, ) \
+	STATE_ENTRY( HTMLTokenizerStateNumericCharacterReferenceEnd, )
 
 typedef NS_ENUM(NSUInteger, HTMLTokenizerState)
 {

Sources/include/HTMLTreeVisitor.h

@@ -0,0 +1,44 @@
+//
+//  HTMLTreeVisitor.h
+//  HTMLKit
+//
+//  Created by Iska on 30.07.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "HTMLNodeVisitor.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class HTMLNode;
+
+/**
+ A HTML Tree Visitor that walks the DOM in tree order. Nodes are visited exacly once
+
+ The provided node visitor is called for each node twice, once when entering the node,
+ and once again when leaving the node.
+
+ @see HTMLNodeVisitor
+ */
+@interface HTMLTreeVisitor : NSObject
+
+/**
+ Initializes a new tree visitor with.
+
+ @param node The root node.
+
+ @return A new instance of a tree visitor.
+ */
+- (instancetype)initWithNode:(HTMLNode *)node;
+
+/**
+ Walks the DOM tree rooted at the provided node with the given node visitor.
+
+ @param visitor A HTMLNodeVisitor implementation.
+ */
+- (void)walkWithNodeVisitor:(id<HTMLNodeVisitor>)visitor;
+
+@end
+
+NS_ASSUME_NONNULL_END

Sources/include/HTMLTreeWalker.h

@@ -49,7 +49,6 @@ NS_ASSUME_NONNULL_BEGIN
  Initializes a new tree walker with no filter and HTMLNodeFilterShowAll show options.
 
  @param node The root node.
- @param filter The node filter to use.
  @return A new instance of a tree walker.
  */
 - (instancetype)initWithNode:(HTMLNode *)node;

Sources/include/NSCharacterSet+HTMLKit.h

@@ -19,17 +19,18 @@ NS_ASSUME_NONNULL_BEGIN
  A character set for HTML whitespace characters: CHARACTER TABULATION U+0009, LINE FEED U+000A, FORM FEED U+000C,
  CARRIAGE RETURN U+000D, and SPACE U+0020.
  */
-+ (instancetype)HTMLWhitespaceCharacterSet;
+
++ (instancetype)htmlkit_HTMLWhitespaceCharacterSet;
 
 /**
  A character set for HTML HEX-Number characters: The digits 0-9, latin small letters a-f, and latin capital letters A-F.
  */
-+ (instancetype)HTMLHexNumberCharacterSet;
++ (instancetype)htmlkit_HTMLHexNumberCharacterSet;
 
 /**
  A character set for CSS Nth-Expression: The digits 0-9, space, latin small n, latin capital N, plus sing and minus sign.
  */
-+ (instancetype)CSSNthExpressionCharacterSet;
++ (instancetype)htmlkit_CSSNthExpressionCharacterSet;
 
 @end
 

Sources/include/NSString+HTMLKit.h

@@ -15,38 +15,17 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface NSString (HTMLKit)
 
-/**
- Checks whether this string is equal to another ignoring the case.
-
- @return `YES` if the two string are equal ignroing the case, `NO` otherwise.
- */
-- (BOOL)isEqualToStringIgnoringCase:(NSString *)aString;
-
-/**
- Checks whether this string is equal to any of the given strings.
-
- @return `YES` if there is an equal string, `NO` otherwise.
- */
-- (BOOL)isEqualToAny:(NSString *)first, ... NS_REQUIRES_NIL_TERMINATION;
-
-/**
- Checks whether this string has a prefix ignoring the case.
-
- @return `YES` if this string has a given prefix ignroing the case, `NO` otherwise.
- */
-- (BOOL)hasPrefixIgnoringCase:(NSString *)aString;
-
 /**
  Checks whether this string is a HTML whitespace string.
 
  @return `YES` if this string is a HTML whitespace string, `NO` otherwise.
  */
-- (BOOL)isHTMLWhitespaceString;
+- (BOOL)htmlkit_isHTMLWhitespaceString;
 
 /**
  @return The length of the leading HTML whitespace characters in this string.
  */
-- (NSUInteger)leadingHTMLWhitespaceLength;
+- (NSUInteger)htmlkit_leadingHTMLWhitespaceLength;
 
 @end
 

Sources/include/NSString+Private.h

@@ -0,0 +1,41 @@
+//
+//  NSString+Private.h
+//  HTMLKit
+//
+//  Created by Iska on 26.03.19.
+//  Copyright © 2019 BrainCookie. All rights reserved.
+//
+
+///------------------------------------------------------
+/// HTMLKit private header
+///------------------------------------------------------
+
+#import <Foundation/Foundation.h>
+
+/**
+ NSStirng category for common helper methods.
+ */
+@interface NSString (Private)
+
+/**
+ Checks whether this string is equal to another ignoring the case.
+
+ @return `YES` if the two string are equal ignroing the case, `NO` otherwise.
+ */
+- (BOOL)isEqualToStringIgnoringCase:(NSString *)aString;
+
+/**
+ Checks whether this string is equal to any of the given strings.
+
+ @return `YES` if there is an equal string, `NO` otherwise.
+ */
+- (BOOL)isEqualToAny:(NSString *)first, ... NS_REQUIRES_NIL_TERMINATION;
+
+/**
+ Checks whether this string has a prefix ignoring the case.
+
+ @return `YES` if this string has a given prefix ignroing the case, `NO` otherwise.
+ */
+- (BOOL)hasPrefixIgnoringCase:(NSString *)aString;
+
+@end

Sources/include/module.modulemap

@@ -5,7 +5,7 @@ module HTMLKit {
 	export *
 
 	explicit module Private {
-		header "CSSCodePoints.h"
+		textual header "CSSCodePoints.h"
 		header "CSSInputStream.h"
 		header "HTMLCharacterToken.h"
 		header "HTMLCommentToken.h"
@@ -22,7 +22,7 @@ module HTMLKit {
 		header "HTMLTagToken.h"
 		header "HTMLToken.h"
 		header "HTMLTokenizer.h"
-		header "HTMLTokenizerCharacters.h"
+		textual header "HTMLTokenizerCharacters.h"
 		header "HTMLTokenizerEntities.h"
 		header "HTMLTokenizerStates.h"
 		header "HTMLTokens.h"
@@ -34,5 +34,6 @@ module HTMLKit {
 		header "HTMLParser+Private.h"
 		header "HTMLNodeTraversal.h"
 		header "HTMLDOMUtils.h"
+		header "NSString+Private.h"
 	}
 }

Tests/HTMLKitTests/CSSSelectorParserTests.m

@@ -7,7 +7,7 @@
 //
 
 #import <XCTest/XCTest.h>
-#import <HTMLKit/HTMLKit.h>
+#import "HTMLKit.h"
 #import "CSSSelectorTest.h"
 #import "CSSSelectorParser.h"
 

Tests/HTMLKitTests/CSSSelectorTest.m

@@ -11,6 +11,7 @@
 #import "HTMLDocument.h"
 #import "HTMLElement.h"
 #import "CSSSelectors.h"
+#import "HTMLKitTestUtil.h"
 
 static NSString * const CSSTests = @"css-tests";
 
@@ -18,8 +19,7 @@ static NSString * const CSSTests = @"css-tests";
 
 + (NSArray *)loadCSSSelectorTests
 {
-	NSString *path = [[NSBundle bundleForClass:self.class] resourcePath];
-	path = [path stringByAppendingPathComponent:CSSTests];
+	NSString *path = [HTMLKitTestUtil pathForFixture:CSSTests ofType:nil inDirectory:nil];
 
 	NSMutableArray *tests = [NSMutableArray array];
 	NSArray *testFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil];

Tests/HTMLKitTests/CSSStructuralPseudoSelectors.m

@@ -0,0 +1,41 @@
+//
+//  CSSStructuralPseudoSelectors.m
+//  HTMLKit
+//
+//  Created by Iska on 18.04.18.
+//  Copyright © 2018 BrainCookie. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "CSSSelectors.h"
+#import "HTMLParser.h"
+#import "HTMLDOM.h"
+
+@interface CSSStructuralPseudoSelectors : XCTestCase
+
+@end
+
+@implementation CSSStructuralPseudoSelectors
+
+#pragma mark - Bug Fixes
+
+- (void)testBugFix_Issue_25
+{
+	NSString *html = @"<table><tr><td>TD #0</td><td>TD #1</td><td>TD #2</td><td>TD #3</td></tr></table>";
+	HTMLDocument *doc = [HTMLDocument documentWithString:html];
+	NSArray<HTMLElement *> *elements = [doc querySelectorAll:@"td:gt(0)"];
+
+	XCTAssertEqual(elements.count, 3);
+	XCTAssertEqualObjects(elements[0].textContent, @"TD #1");
+	XCTAssertEqualObjects(elements[1].textContent, @"TD #2");
+	XCTAssertEqualObjects(elements[2].textContent, @"TD #3");
+
+	elements = [doc querySelectorAll:@"td:lt(0)"];
+	XCTAssertEqual(elements.count, 0);
+
+	elements = [doc querySelectorAll:@"td:eq(0)"];
+	XCTAssertEqual(elements.count, 1);
+	XCTAssertEqualObjects(elements[0].textContent, @"TD #0");
+}
+
+@end

Tests/HTMLKitTests/HTML5LibTokenizerTest.h

@@ -14,9 +14,9 @@
 @property (nonatomic, copy) NSString *title;
 @property (nonatomic, copy) NSString *input;
 @property (nonatomic, strong) NSArray *output;
+@property (nonatomic, strong) NSArray *errors;
 @property (nonatomic, strong) NSArray *initialStates;
 @property (nonatomic, copy) NSString *lastStartTag;
-@property (nonatomic, assign) BOOL ignoreErrorOrder;
 
 + (NSDictionary *)loadHTML5LibTokenizerTests;
 

Tests/HTMLKitTests/HTML5LibTokenizerTest.m

@@ -7,23 +7,22 @@
 //
 
 #import "HTML5LibTokenizerTest.h"
+#import "HTMLOrderedDictionary.h"
 #import "HTMLTokenizerStates.h"
 #import "HTMLTokens.h"
+#import "HTMLKitTestUtil.h"
 
 static NSString * const HTML5LibTests = @"html5lib-tests";
-static NSString * const TOKENIZER = @"tokenizer";
+static NSString * const Tokenizer = @"tokenizer";
 
 @implementation HTML5LibTokenizerTest
 
 + (NSDictionary *)loadHTML5LibTokenizerTests
 {
-	NSString *path = [[NSBundle bundleForClass:self.class] resourcePath];
-	path = [path stringByAppendingPathComponent:HTML5LibTests];
-	path = [path stringByAppendingPathComponent:TOKENIZER];
-
-	NSMutableDictionary *testsMap = [NSMutableDictionary dictionary];
+	NSString *path = [HTMLKitTestUtil pathForFixture:Tokenizer ofType:nil inDirectory:HTML5LibTests];
 	NSArray *testFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil];
 
+	NSMutableDictionary *testsMap = [NSMutableDictionary dictionary];
 	for (NSString *testFile in testFiles) {
 		if (![testFile.pathExtension isEqualToString:@"test"]) {
 			continue;
@@ -71,16 +70,16 @@ static NSString * const TOKENIZER = @"tokenizer";
 {
 	BOOL doubleEscaped = [test[@"doubleEscaped"] boolValue];
 
-		// Test Title
+	// Test Title
 	self.title = test[@"description"];
 
-		// Test Input
+	// Test Input
 	self.input = test[@"input"];
 	if (doubleEscaped) {
 		self.input = [self processDoubleEscaped:self.input];
 	}
 
-		// Test Output
+	// Test Output
 	NSMutableArray *tokens = [NSMutableArray array];
 	NSArray *outputs = test[@"output"];
 	for (NSArray *output in outputs) {
@@ -90,7 +89,7 @@ static NSString * const TOKENIZER = @"tokenizer";
 	[tokens addObject:[HTMLEOFToken token]];
 	self.output = tokens;
 
-		// Test Initial States
+	// Test Initial States
 	NSMutableArray *initialStates = [NSMutableArray array];
 
 	NSArray *states = test[@"initialStates"];
@@ -102,6 +101,10 @@ static NSString * const TOKENIZER = @"tokenizer";
 			state = HTMLTokenizerStateRCDATA;
 		} else if ([name isEqualToString:@"RAWTEXT state"]) {
 			state = HTMLTokenizerStateRAWTEXT;
+		} else if ([name isEqualToString:@"Script data state"]) {
+			state = HTMLTokenizerStateScriptData;
+		} else if ([name isEqualToString:@"CDATA section state"]) {
+			state = HTMLTokenizerStateCDATASection;
 		}
 		[initialStates addObject:@(state)];
 	}
@@ -111,19 +114,21 @@ static NSString * const TOKENIZER = @"tokenizer";
 
 	self.initialStates = initialStates;
 
-		// Test Last Start Tag
+	// Test Last Start Tag
 	self.lastStartTag = test[@"lastStartTag"];
 
-		// Ignore Error Order
-	self.ignoreErrorOrder = [test[@"ignoreErrorOrder"] boolValue];
+	// Test errors
+	NSArray *errors = test[@"errors"];
+	NSMutableArray *errorTokens = [NSMutableArray new];
+	for (NSDictionary *error in errors) {
+		HTMLParseErrorToken *token = [[HTMLParseErrorToken alloc] initWithCode:error[@"code"] details:nil location:0];
+		[errorTokens addObject:token];
+	}
+	self.errors = errorTokens;
 }
 
 - (HTMLToken *)processOutputToken:(id)output doubleEscaped:(BOOL)doubleEscaped
 {
-	if ([output isKindOfClass:[NSString class]] && [output isEqualToString:@"ParseError"]) {
-		return [HTMLParseErrorToken new];
-	}
-
 	NSString *type = [output firstObject];
 
 	NSString *data = nil;
@@ -147,8 +152,6 @@ static NSString * const TOKENIZER = @"tokenizer";
 		return token;
 	} else if ([type isEqualToString:@"EndTag"]) {
 		return [[HTMLEndTagToken alloc] initWithTagName:data];
-	} else if ([type isEqualToString:@"ParseError"]) {
-		return [HTMLParseErrorToken new];
 	} else if ([type isEqualToString:@"StartTag"]) {
 		HTMLStartTagToken *token = [[HTMLStartTagToken alloc] initWithTagName:data];
 		NSDictionary *attributes = output[2];

Tests/HTMLKitTests/HTML5LibTreeConstructionTest.m

@@ -9,10 +9,12 @@
 #import "HTML5LibTreeConstructionTest.h"
 #import <XCTest/XCTest.h>
 
+#import "HTMLDOM.h"
 #import "HTMLDocumentType.h"
 #import "HTMLElement.h"
 #import "HTMLText.h"
 #import "HTMLComment.h"
+#import "HTMLKitTestUtil.h"
 
 static NSString * const HTML5LibTests = @"html5lib-tests";
 static NSString * const TreeConstruction = @"tree-construction";
@@ -21,13 +23,10 @@ static NSString * const TreeConstruction = @"tree-construction";
 
 + (NSDictionary *)loadHTML5LibTreeConstructionTests
 {
-	NSString *path = [[NSBundle bundleForClass:self.class] resourcePath];
-	path = [path stringByAppendingPathComponent:HTML5LibTests];
-	path = [path stringByAppendingPathComponent:TreeConstruction];
-
-	NSMutableDictionary *testsMap = [NSMutableDictionary dictionary];
+	NSString *path = [HTMLKitTestUtil pathForFixture:TreeConstruction ofType:nil inDirectory:HTML5LibTests];
 	NSArray *testFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:nil];
 
+	NSMutableDictionary *testsMap = [NSMutableDictionary dictionary];
 	for (NSString *testFile in testFiles) {
 		if (![testFile.pathExtension isEqualToString:@"dat"]) {
 			continue;
@@ -48,7 +47,7 @@ static NSString * const TreeConstruction = @"tree-construction";
 	NSMutableArray *tests = [NSMutableArray array];
 
 	NSScanner *scanner = [NSScanner scannerWithString:contents];
-	NSString * (^ nextTest)() = ^ NSString * () {
+	NSString * (^ nextTest)(void) = ^ NSString * () {
 		NSString *str;
 		[scanner scanUpToString:@"\n\n#data" intoString:&str];
 		return str;
@@ -291,6 +290,8 @@ NS_INLINE NSArray * parseAttribute(NSString *str)
 	NSRange range = [str rangeOfString:@"=" options:0];
 
 	NSString *key = [str substringToIndex:range.location];
+	key = [key stringByReplacingOccurrencesOfString:@" " withString:@":"];
+
 	NSString *value = [str substringFromIndex:range.location + 2];
 	value = [value substringToIndex:value.length - 1];