From ddd6f85ece22440ee731748a72d2f0a1bd0ca259 Mon Sep 17 00:00:00 2001 From: John Estropia Date: Wed, 4 Dec 2024 14:24:29 +0900 Subject: [PATCH] remove logs --- .../StorybookKit/Internals/machOLoader.swift | 61 +++++++++++-------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/Sources/StorybookKit/Internals/machOLoader.swift b/Sources/StorybookKit/Internals/machOLoader.swift index b78983a..61100a3 100644 --- a/Sources/StorybookKit/Internals/machOLoader.swift +++ b/Sources/StorybookKit/Internals/machOLoader.swift @@ -112,12 +112,7 @@ extension Book { } guard contextDescriptor.pointee.kind().canConformToProtocol, - !filterByStorybookPageMacro || self._magicSubstring.withCString( - { - let nameCString = contextDescriptor.resolvePointer(for: \.name) - return nil != strstr(nameCString, $0) - } - ) + !filterByStorybookPageMacro || contextDescriptor.nameContains(self._magicSubstring) else { continue } @@ -187,12 +182,7 @@ extension Book { } guard contextDescriptor.pointee.kind().canConformToProtocol, - !excludeStorybookPageMacro || !self._magicSubstring.withCString( - { - let nameCString = contextDescriptor.resolvePointer(for: \.name) - return nil != strstr(nameCString, $0) - } - ) + !excludeStorybookPageMacro || !contextDescriptor.nameContains(self._magicSubstring) else { continue } @@ -231,7 +221,7 @@ extension Book { let fileID = previewType.fileID let line = previewType.line let preview = try! previewType.makePreview() - +// dump(preview) var title: String? var makeBookView: ((String) -> any View)? let previewMirror: Mirror = .init(reflecting: preview) @@ -277,8 +267,16 @@ extension Book { // let factory = MakeViewFactory(anyFactory.value) // let view = factory() // print(view) -// dump(view) -// anyView = .init(view) +// makeBookView = { title in +// BookPreview( +// fileID, +// line, +// title: title, +// viewBlock: { _ in +// view +// } +// ) +// } case "DeveloperToolsSupport.DefaultPreviewSource": // iOS 18 guard @@ -356,17 +354,17 @@ extension Book { } case let sourceTypeName: - print(sourceTypeName) +// print(sourceTypeName) break } case "traits": - let traitsMirror: Mirror = .init(reflecting: previewChild.value) - dump(traitsMirror) +// let traitsMirror: Mirror = .init(reflecting: previewChild.value) +// dump(traitsMirror) break default: - print(previewChild.label) +// print(previewChild.label) break } } @@ -426,7 +424,7 @@ extension Book { extension UnsafePointer where Pointee: SwiftLayoutPointer { - func resolvePointer(for keyPath: KeyPath>) -> UnsafePointer { + fileprivate func resolvePointer(for keyPath: KeyPath>) -> UnsafePointer { let base: UnsafeRawPointer = .init(self) let fieldOffset = MemoryLayout.offset(of: keyPath)! let relativePointer = self.pointee[keyPath: keyPath] @@ -436,7 +434,7 @@ extension UnsafePointer where Pointee: SwiftLayoutPointer { .assumingMemoryBound(to: U.self) } - func resolveValue(for keyPath: KeyPath>) -> U { + fileprivate func resolveValue(for keyPath: KeyPath>) -> U { let base: UnsafeRawPointer = .init(self) let fieldOffset = MemoryLayout.offset(of: keyPath)! let relativePointer = self.pointee[keyPath: keyPath] @@ -447,17 +445,28 @@ extension UnsafePointer where Pointee: SwiftLayoutPointer { } } -protocol SwiftLayoutPointer { +extension UnsafePointer where Pointee == SwiftTypeContextDescriptor { + fileprivate func nameContains(_ string: String) -> Bool { + string.withCString( + { + let nameCString = self.resolvePointer(for: \.name) + return nil != strstr(nameCString, $0) + } + ) + } +} + +fileprivate protocol SwiftLayoutPointer { static var maskValue: Int32 { get } } extension SwiftLayoutPointer { - static var maskValue: Int32 { + fileprivate static var maskValue: Int32 { return 0 } } -struct SwiftRelativePointer { +fileprivate struct SwiftRelativePointer { var offset: Int32 = 0 @@ -495,7 +504,7 @@ extension SwiftRelativePointer where T: SwiftLayoutPointer { } } -struct SwiftTypeMetadataRecord: SwiftLayoutPointer { +fileprivate struct SwiftTypeMetadataRecord: SwiftLayoutPointer { var pointer: SwiftRelativePointer @@ -521,7 +530,7 @@ struct SwiftTypeMetadataRecord: SwiftLayoutPointer { } } -struct SwiftTypeContextDescriptor: SwiftLayoutPointer { +fileprivate struct SwiftTypeContextDescriptor: SwiftLayoutPointer { var flags: UInt32 = 0 var parent: SwiftRelativePointer = .init() var name: SwiftRelativePointer = .init()