obstruct 0.2.8__tar.gz → 0.2.10__tar.gz

{obstruct-0.2.8 → obstruct-0.2.10}/.idea/workspace.xml

@@ -4,7 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="b482b6b4-48ce-4be1-bf3c-a72ec254fa35" name="更改" comment="增强 array 类型的支持 x2">
+    <list default="true" id="b482b6b4-48ce-4be1-bf3c-a72ec254fa35" name="更改" comment="fix: 修复 slots 的生成逻辑">
+      <change afterPath="$PROJECT_DIR$/src/obstruct/metadata_marks.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/obstruct/__version__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/__version__.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/obstruct/struct_type.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/struct_type.py" afterDir="false" />
     </list>
@@ -44,26 +45,26 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ModuleVcsDetector.initialDetectionPerformed": "true",
-    "Python.test.executor": "Run",
-    "Python.test_speed.executor": "Run",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.git.unshallow": "true",
-    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
-    "codeWithMe.voiceChat.enabledByDefault": "false",
-    "git-widget-placeholder": "main",
-    "last_opened_file_path": "E:/.projects/obstruct",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.jshint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.jshint": "",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
+    &quot;Python.test.executor&quot;: &quot;Run&quot;,
+    &quot;Python.test_speed.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
+    &quot;codeWithMe.voiceChat.enabledByDefault&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;last_opened_file_path&quot;: &quot;E:/.projects/obstruct&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.jshint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.jshint&quot;: &quot;&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="Python.test_speed">
     <configuration name="test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="obstruct" />
@@ -183,7 +184,55 @@
       <option name="project" value="LOCAL" />
       <updated>1786883898686</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="修复：不参与初始化方法的属性不应作为结构体的字段">
+      <option name="closed" value="true" />
+      <created>1786884236136</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1786884236136</updated>
+    </task>
+    <task id="LOCAL-00008" summary="功能：添加 `compile_struct` 函数，透明编译过程">
+      <option name="closed" value="true" />
+      <created>1786884539584</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1786884539584</updated>
+    </task>
+    <task id="LOCAL-00009" summary="修复：unpack.py 中没有移除的调试逻辑">
+      <option name="closed" value="true" />
+      <created>1786884559640</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1786884559640</updated>
+    </task>
+    <task id="LOCAL-00010" summary="修复：unpack.py 中没有移除的调试逻辑">
+      <option name="closed" value="true" />
+      <created>1786884576538</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1786884576538</updated>
+    </task>
+    <task id="LOCAL-00011" summary="chore: 移除 test_speed.py 中的调试逻辑">
+      <option name="closed" value="true" />
+      <created>1786884643125</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1786884643125</updated>
+    </task>
+    <task id="LOCAL-00012" summary="fix: 修复 slots 的生成逻辑">
+      <option name="closed" value="true" />
+      <created>1786966736534</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1786966736535</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -207,6 +256,12 @@
     <MESSAGE value="修正了一些命名" />
     <MESSAGE value="增强 array 类型的支持" />
     <MESSAGE value="增强 array 类型的支持 x2" />
-    <option name="LAST_COMMIT_MESSAGE" value="增强 array 类型的支持 x2" />
+    <MESSAGE value="修复：不参与初始化方法的属性不应作为结构体的字段" />
+    <MESSAGE value="功能：添加 `compile_struct` 函数，透明编译过程" />
+    <MESSAGE value="修复：unpack.py 中没有移除的调试逻辑" />
+    <MESSAGE value="修复：unpack.py 中没有移除的调试逻辑&#10;更新版本号至 0.2.8" />
+    <MESSAGE value="chore: 移除 test_speed.py 中的调试逻辑" />
+    <MESSAGE value="fix: 修复 slots 的生成逻辑" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix: 修复 slots 的生成逻辑" />
   </component>
 </project>

{obstruct-0.2.8 → obstruct-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: obstruct
-Version: 0.2.8
+Version: 0.2.10
 Author-email: LittleNightSong <LittleNightSongYO@outlook.com>
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python

obstruct-0.2.10/src/obstruct/__version__.py

@@ -0,0 +1 @@
+version = "0.2.10"

obstruct-0.2.10/src/obstruct/metadata_marks.py

@@ -0,0 +1,5 @@
+from enum import Enum
+
+
+class Marks(Enum):
+    NOT_A_CFIELD = 0

{obstruct-0.2.8 → obstruct-0.2.10}/src/obstruct/struct_type.py

@@ -5,6 +5,7 @@ from collections.abc import Buffer
 from typing import Self, Generator, Any, ClassVar
 
 from obstruct.aot import create_pack_methods, create_unpack_methods
+from obstruct.metadata_marks import Marks
 
 
 class CType(typing.Protocol):
@@ -44,7 +45,7 @@ class StructMeta(type):
                 format=annotationlib.Format.STRING
             )
 
-        slots |= {k for k in annotations.keys() if not k.startswith('_')}
+        slots |= {k for k in annotations.keys()}
 
         attrs['__slots__'] = slots
         attrs['__cendian__'] = endian
@@ -53,7 +54,14 @@ class StructMeta(type):
 
     def __compile_struct__(cls):
         from obstruct.methods import to_format_string
-        fields = [i for i in dataclasses.fields(cls) if i.init]
+        fields = [
+            i for i in dataclasses.fields(cls)
+
+            if (
+                    typing.get_origin(i.type) is not typing.Annotated
+                    or Marks.NOT_A_CFIELD not in i.type.__metadata__
+            )
+        ]
         real_annotations = typing.get_type_hints(cls)
 
         for field in fields:

{obstruct-0.2.8 → obstruct-0.2.10}/test/test_speed.py

@@ -36,8 +36,6 @@ print('MyStruct size', MyStruct.__cstruct__.size)
 print('AnotherStruct size', AnotherStruct.__cstruct__.size)
 
 
-exit()
-
 data = MyStruct(
     1,2,1.0,4,5,6,7,8,9,b'8',1,2
 )

obstruct-0.2.8/src/obstruct/__version__.py

@@ -1 +0,0 @@
-version = "0.2.8"