Replace type with type_definitions (#30209)

* Replace type with type_definitions * Minor change to make sure larger summary is used when merging patch * restyle --------- Co-authored-by: Andrei Litvin <andreilitvin@google.com>
project-chip · Feb 12, 2024 · 2393890 · 2393890
1 parent 2eabfc9
commit 2393890
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 18 deletions.
diff --git a/scripts/codepregen.py b/scripts/codepregen.py
@@ -29,7 +29,7 @@
     from pregenerate import FindPregenerationTargets, TargetFilter
 
 from pregenerate.executors import DryRunner, ShellRunner
-from pregenerate.types import IdlFileType
+from pregenerate.type_definitions import IdlFileType
 
 try:
     import coloredlogs

diff --git a/scripts/pregenerate/__init__.py b/scripts/pregenerate/__init__.py
@@ -19,7 +19,7 @@
 from dataclasses import dataclass, field
 from typing import Iterator, List, Optional
 
-from .types import IdlFileType, InputIdlFile
+from .type_definitions import IdlFileType, InputIdlFile
 from .using_codegen import (CodegenCppAppPregenerator, CodegenCppClustersTLVMetaPregenerator,
                             CodegenCppProtocolsTLVMetaPregenerator, CodegenJavaClassPregenerator, CodegenJavaJNIPregenerator)
 from .using_zap import ZapApplicationPregenerator

diff --git a/scripts/pregenerate/types.py → scripts/pregenerate/type_definitions.py b/scripts/pregenerate/types.py → scripts/pregenerate/type_definitions.py
diff --git a/scripts/pregenerate/using_codegen.py b/scripts/pregenerate/using_codegen.py
@@ -15,7 +15,7 @@
 import logging
 import os
 
-from .types import IdlFileType, InputIdlFile
+from .type_definitions import IdlFileType, InputIdlFile
 
 CODEGEN_PY_PATH = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', 'codegen.py'))

diff --git a/scripts/pregenerate/using_zap.py b/scripts/pregenerate/using_zap.py
@@ -16,7 +16,7 @@
 import os
 from enum import Enum, auto
 
-from .types import IdlFileType, InputIdlFile
+from .type_definitions import IdlFileType, InputIdlFile
 
 ZAP_GENERATE_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'tools', 'zap', 'generate.py'))
 

diff --git a/scripts/py_matter_idl/files.gni b/scripts/py_matter_idl/files.gni
@@ -38,10 +38,10 @@ matter_idl_generator_sources = [
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/idl/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/java/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/generators/registry.py",
-  "${chip_root}/scripts/py_matter_idl/matter_idl/generators/types.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/generators/type_definitions.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/lint/__init__.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py",
-  "${chip_root}/scripts/py_matter_idl/matter_idl/lint/types.py",
+  "${chip_root}/scripts/py_matter_idl/matter_idl/lint/type_definitions.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/matter_idl_parser.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/matter_idl_types.py",
   "${chip_root}/scripts/py_matter_idl/matter_idl/test_backwards_compatibility.py",

diff --git a/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py b/scripts/py_matter_idl/matter_idl/data_model_xml/handlers/parsing.py
@@ -18,7 +18,7 @@
 from typing import Optional
 from xml.sax.xmlreader import AttributesImpl
 
-from matter_idl.generators.types import GetDataTypeSizeInBits, IsSignedDataType
+from matter_idl.generators.type_definitions import GetDataTypeSizeInBits, IsSignedDataType
 from matter_idl.matter_idl_types import AccessPrivilege, Attribute, Command, ConstantEntry, DataType, Event, EventPriority, Field
 
 LOGGER = logging.getLogger('data-model-xml-data-parsing')

diff --git a/scripts/py_matter_idl/matter_idl/generators/java/__init__.py b/scripts/py_matter_idl/matter_idl/generators/java/__init__.py
@@ -20,8 +20,8 @@
 from typing import List, Optional, Set
 
 from matter_idl.generators import CodeGenerator, GeneratorStorage
-from matter_idl.generators.types import (BasicInteger, BasicString, FundamentalType, IdlBitmapType, IdlEnumType, IdlType,
-                                         ParseDataType, TypeLookupContext)
+from matter_idl.generators.type_definitions import (BasicInteger, BasicString, FundamentalType, IdlBitmapType, IdlEnumType, IdlType,
+                                                    ParseDataType, TypeLookupContext)
 from matter_idl.matter_idl_types import (Attribute, Cluster, ClusterSide, Command, DataType, Field, FieldQuality, Idl, Struct,
                                          StructQuality, StructTag)
 from stringcase import capitalcase

diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py
@@ -20,8 +20,8 @@
 from typing import List, Optional, Set
 
 from matter_idl.generators import CodeGenerator, GeneratorStorage
-from matter_idl.generators.types import (BasicInteger, BasicString, FundamentalType, IdlBitmapType, IdlEnumType, IdlType,
-                                         ParseDataType, TypeLookupContext)
+from matter_idl.generators.type_definitions import (BasicInteger, BasicString, FundamentalType, IdlBitmapType, IdlEnumType, IdlType,
+                                                    ParseDataType, TypeLookupContext)
 from matter_idl.matter_idl_types import (Attribute, Cluster, ClusterSide, Command, DataType, Field, FieldQuality, Idl, Struct,
                                          StructQuality, StructTag)
 from stringcase import capitalcase

diff --git a/...matter_idl/matter_idl/generators/types.py → ...matter_idl/generators/type_definitions.py b/...matter_idl/matter_idl/generators/types.py → ...matter_idl/generators/type_definitions.py
diff --git a/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py b/scripts/py_matter_idl/matter_idl/lint/lint_rules_parser.py
@@ -11,15 +11,15 @@
 from lark.visitors import Discard, Transformer, v_args
 
 try:
-    from .types import (AttributeRequirement, ClusterAttributeDeny, ClusterCommandRequirement, ClusterRequirement,
-                        ClusterValidationRule, RequiredAttributesRule, RequiredCommandsRule)
+    from matter_idl.lint.type_definitions import AttributeRequirement
 except ImportError:
     import sys
-
     sys.path.append(os.path.join(os.path.abspath(
         os.path.dirname(__file__)), "..", ".."))
-    from matter_idl.lint.types import (AttributeRequirement, ClusterAttributeDeny, ClusterCommandRequirement, ClusterRequirement,
-                                       ClusterValidationRule, RequiredAttributesRule, RequiredCommandsRule)
+    from matter_idl.lint.type_definitions import AttributeRequirement
+
+from matter_idl.lint.type_definitions import (ClusterAttributeDeny, ClusterCommandRequirement, ClusterRequirement,
+                                              ClusterValidationRule, RequiredAttributesRule, RequiredCommandsRule)
 
 
 class ElementNotFoundError(Exception):

diff --git a/...ts/py_matter_idl/matter_idl/lint/types.py → ...r_idl/matter_idl/lint/type_definitions.py b/...ts/py_matter_idl/matter_idl/lint/types.py → ...r_idl/matter_idl/lint/type_definitions.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Project CHIP Authors
+# Copyright (c) 2022-2023 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/scripts/py_matter_idl/matter_idl/zapxml/handlers/parsing.py b/scripts/py_matter_idl/matter_idl/zapxml/handlers/parsing.py
@@ -14,7 +14,7 @@
 
 from typing import Optional
 
-from matter_idl.generators.types import GetDataTypeSizeInBits, IsSignedDataType
+from matter_idl.generators.type_definitions import GetDataTypeSizeInBits, IsSignedDataType
 from matter_idl.matter_idl_types import AccessPrivilege, Attribute, AttributeQuality, DataType, Field, FieldQuality