Revert internal identifier

Author: markmur

.swiftformat

@@ -0,0 +1,11 @@
+--indent 4
+--linebreaks lf
+--wraparguments before-first
+--wrapcollections before-first
+--commas inline
+--allman false
+--semicolons inline
+--trimwhitespace always
+--disable redundantReturn,hoistAwait,preferKeyPath,redundantInternal,redundantPublic
+--swiftversion 5.7.1
+--extensionacl on-declarations

…hopify/checkout-sheet-kit/.swiftlint.yml .swiftlint.ymlmodules/@shopify/checkout-sheet-kit/.swiftlint.yml renamed to .swiftlint.yml modules/@shopify/checkout-sheet-kit/.swiftlint.yml renamed to .swiftlint.yml

@@ -9,9 +9,6 @@ disabled_rules:
   - function_body_length
   - trailing_comma
 
-included:
-  ios
-
 opt_in_rules:
   - array_init
   - collection_alignment
@@ -32,6 +29,7 @@ opt_in_rules:
   - switch_case_alignment:
     indented_cases: false
   - fallthrough
+  - explicit_acl
 
 nesting:
   type_level:

modules/@shopify/checkout-sheet-kit/ios/ShopifyCheckoutSheetKit.swift

@@ -1,25 +1,25 @@
 /*
-MIT License
+ MIT License
 
-Copyright 2023 - Present, Shopify Inc.
+ Copyright 2023 - Present, Shopify Inc.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 import Foundation
 import React
@@ -30,7 +30,7 @@ import UIKit
 class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
     private var hasListeners = false
 
-    var checkoutSheet: UIViewController?
+    internal var checkoutSheet: UIViewController?
 
     override var methodQueue: DispatchQueue! {
         return DispatchQueue.main
@@ -78,7 +78,7 @@ class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
                 "__typename": "CheckoutExpiredError",
                 "message": message,
                 "code": code.rawValue,
-                "recoverable": recoverable,
+                "recoverable": recoverable
             ])
         } else if case let .checkoutUnavailable(message, code, recoverable) = error {
             switch code {
@@ -87,38 +87,38 @@ class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
                     "__typename": "CheckoutClientError",
                     "message": message,
                     "code": clientErrorCode.rawValue,
-                    "recoverable": recoverable,
+                    "recoverable": recoverable
                 ])
             case let .httpError(statusCode):
                 sendEvent(withName: "error", body: [
                     "__typename": "CheckoutHTTPError",
                     "message": message,
                     "code": "http_error",
                     "statusCode": statusCode,
-                    "recoverable": recoverable,
+                    "recoverable": recoverable
                 ])
             }
         } else if case let .configurationError(message, code, recoverable) = error {
             sendEvent(withName: "error", body: [
                 "__typename": "ConfigurationError",
                 "message": message,
                 "code": code.rawValue,
-                "recoverable": recoverable,
+                "recoverable": recoverable
             ])
         } else if case let .sdkError(underlying, recoverable) = error {
             var errorMessage = "\(underlying.localizedDescription)"
             sendEvent(withName: "error", body: [
                 "__typename": "InternalError",
                 "code": "unknown",
                 "message": errorMessage,
-                "recoverable": recoverable,
+                "recoverable": recoverable
             ])
         } else {
             sendEvent(withName: "error", body: [
                 "__typename": "UnknownError",
                 "code": "unknown",
                 "message": error.localizedDescription,
-                "recoverable": error.isRecoverable,
+                "recoverable": error.isRecoverable
             ])
         }
     }
@@ -148,7 +148,7 @@ class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
 
     @objc override func constantsToExport() -> [AnyHashable: Any]! {
         return [
-            "version": ShopifyCheckoutSheetKit.version,
+            "version": ShopifyCheckoutSheetKit.version
         ]
     }
 
@@ -250,7 +250,7 @@ class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
             "preloading": ShopifyCheckoutSheetKit.configuration.preloading.enabled,
             "colorScheme": ShopifyCheckoutSheetKit.configuration.colorScheme.rawValue,
             "tintColor": ShopifyCheckoutSheetKit.configuration.tintColor,
-            "backgroundColor": ShopifyCheckoutSheetKit.configuration.backgroundColor,
+            "backgroundColor": ShopifyCheckoutSheetKit.configuration.backgroundColor
         ]
 
         resolve(config)
@@ -290,7 +290,7 @@ class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
             "id": encoded["id"],
             "name": encoded["name"],
             "timestamp": encoded["timestamp"],
-            "type": "STANDARD",
+            "type": "STANDARD"
         ] as [String: Any]
     }
 
@@ -311,7 +311,7 @@ class RCTShopifyCheckoutSheetKit: RCTEventEmitter, CheckoutDelegate {
             "id": event.id,
             "name": event.name,
             "timestamp": event.timestamp,
-            "type": "CUSTOM",
+            "type": "CUSTOM"
         ] as [String: Any]
     }
 }

scripts/lint_swift

@@ -1,27 +1,14 @@
 #!/bin/bash
 
 DIR=modules/@shopify/checkout-sheet-kit
-
-# Check for verbose flag
-VERBOSE=false
-if [[ "$*" == *"--verbose"* ]]; then
-    VERBOSE=true
-fi
-
-# Accept --verbose before check/fix
-if [[ "$1" == "--verbose" ]]; then
-    MODE="${2:-check}"
-else
-    MODE="${1:-check}"
-fi
+MODE="${1:-check}"
 
 # Validate the mode
 if [[ "$MODE" != "check" && "$MODE" != "fix" ]]; then
     echo "❌ Invalid mode: $MODE"
-    echo "Usage: $0 [check|fix] [--verbose]"
+    echo "Usage: $0 [check|fix]"
     echo "  check: Run linters in check mode (default)"
     echo "  fix:   Run linters in fix mode to auto-fix issues"
-    echo "  --verbose: Show detailed output from linters"
     exit 1
 fi
 
@@ -49,30 +36,25 @@ if ! which swiftformat >/dev/null; then
 fi
 
 # Run SwiftLint
-QUIET_FLAG=""
-if [[ "$VERBOSE" == "false" ]]; then
-    QUIET_FLAG="--quiet"
-fi
-
 if [[ "$MODE" == "check" ]]; then
     echo "🔄 Running SwiftLint in check mode..."
-    swiftlint lint --strict $QUIET_FLAG $DIR
+    swiftlint lint --strict $DIR
     LINT_STATUS=$?
 else
     echo "🔄 Running SwiftLint in fix mode..."
-    swiftlint lint --fix $QUIET_FLAG $DIR
+    swiftlint lint --fix $DIR
     LINT_STATUS=$?
 fi
 echo "SwiftLint exit status: $LINT_STATUS"
 
 # Run SwiftFormat
 if [[ "$MODE" == "check" ]]; then
     echo "🔄 Running SwiftFormat in check mode..."
-    swiftformat $DIR $QUIET_FLAG --lint
+    swiftformat $DIR --lint
     FORMAT_STATUS=$?
 else
     echo "🔄 Running SwiftFormat in fix mode..."
-    swiftformat $DIR $QUIET_FLAG
+    swiftformat $DIR
     FORMAT_STATUS=$?
 fi
 echo "SwiftFormat exit status: $FORMAT_STATUS"
@@ -82,8 +64,8 @@ print_linting_error() {
     local tool_name=$1
     echo "❌ $tool_name detected issues that need to be fixed."
     echo "🔧 How to fix:"
-    echo "   Shopify employee? Run 'dev fix' or 'dev lint --verbose' to see detailed output"
-    echo "   Not a Shopify employee? Run './Scripts/lint fix' to auto-fix issues"
+    echo "   Shopify employee? Run 'dev fix' or 'dev check' to see detailed output"
+    echo "   Not a Shopify employee? Run './scripts/lint_swift fix' to auto-fix issues"
     if [[ "$tool_name" == "SwiftLint" ]]; then
         echo "   Then fix any remaining non-autofixable issues manually"
     fi