micropython-stubber 1.23.1__py3-none-any.whl → 1.23.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {micropython_stubber-1.23.1.dist-info → micropython_stubber-1.23.2.dist-info}/LICENSE +30 -30
- {micropython_stubber-1.23.1.dist-info → micropython_stubber-1.23.2.dist-info}/METADATA +32 -15
- micropython_stubber-1.23.2.dist-info/RECORD +158 -0
- micropython_stubber-1.23.2.dist-info/entry_points.txt +5 -0
- mpflash/README.md +220 -194
- mpflash/libusb_flash.ipynb +203 -203
- mpflash/mpflash/add_firmware.py +98 -98
- mpflash/mpflash/ask_input.py +236 -236
- mpflash/mpflash/basicgit.py +284 -284
- mpflash/mpflash/bootloader/__init__.py +2 -2
- mpflash/mpflash/bootloader/activate.py +60 -60
- mpflash/mpflash/bootloader/detect.py +82 -82
- mpflash/mpflash/bootloader/manual.py +101 -101
- mpflash/mpflash/bootloader/micropython.py +12 -12
- mpflash/mpflash/bootloader/touch1200.py +36 -36
- mpflash/mpflash/cli_download.py +129 -129
- mpflash/mpflash/cli_flash.py +224 -219
- mpflash/mpflash/cli_group.py +111 -111
- mpflash/mpflash/cli_list.py +87 -81
- mpflash/mpflash/cli_main.py +39 -39
- mpflash/mpflash/common.py +210 -165
- mpflash/mpflash/config.py +44 -44
- mpflash/mpflash/connected.py +96 -78
- mpflash/mpflash/download.py +364 -364
- mpflash/mpflash/downloaded.py +130 -130
- mpflash/mpflash/errors.py +9 -9
- mpflash/mpflash/flash/__init__.py +55 -55
- mpflash/mpflash/flash/esp.py +59 -59
- mpflash/mpflash/flash/stm32.py +19 -19
- mpflash/mpflash/flash/stm32_dfu.py +104 -104
- mpflash/mpflash/flash/uf2/__init__.py +88 -88
- mpflash/mpflash/flash/uf2/boardid.py +15 -15
- mpflash/mpflash/flash/uf2/linux.py +136 -130
- mpflash/mpflash/flash/uf2/macos.py +42 -42
- mpflash/mpflash/flash/uf2/uf2disk.py +12 -12
- mpflash/mpflash/flash/uf2/windows.py +43 -43
- mpflash/mpflash/flash/worklist.py +170 -170
- mpflash/mpflash/list.py +106 -99
- mpflash/mpflash/logger.py +41 -41
- mpflash/mpflash/mpboard_id/__init__.py +93 -93
- mpflash/mpflash/mpboard_id/add_boards.py +251 -251
- mpflash/mpflash/mpboard_id/board.py +37 -37
- mpflash/mpflash/mpboard_id/board_id.py +86 -86
- mpflash/mpflash/mpboard_id/store.py +43 -43
- mpflash/mpflash/mpremoteboard/__init__.py +266 -222
- mpflash/mpflash/mpremoteboard/mpy_fw_info.py +141 -141
- mpflash/mpflash/mpremoteboard/runner.py +140 -140
- mpflash/mpflash/vendor/click_aliases.py +91 -91
- mpflash/mpflash/vendor/dfu.py +165 -165
- mpflash/mpflash/vendor/pydfu.py +605 -605
- mpflash/mpflash/vendor/readme.md +2 -2
- mpflash/mpflash/versions.py +135 -135
- mpflash/poetry.lock +1599 -1599
- mpflash/pyproject.toml +65 -65
- mpflash/stm32_udev_rules.md +62 -62
- stubber/__init__.py +3 -3
- stubber/board/board_info.csv +193 -193
- stubber/board/boot.py +34 -34
- stubber/board/createstubs.py +1004 -986
- stubber/board/createstubs_db.py +826 -825
- stubber/board/createstubs_db_min.py +332 -331
- stubber/board/createstubs_db_mpy.mpy +0 -0
- stubber/board/createstubs_lvgl.py +741 -741
- stubber/board/createstubs_lvgl_min.py +741 -741
- stubber/board/createstubs_mem.py +767 -766
- stubber/board/createstubs_mem_min.py +307 -306
- stubber/board/createstubs_mem_mpy.mpy +0 -0
- stubber/board/createstubs_min.py +295 -294
- stubber/board/createstubs_mpy.mpy +0 -0
- stubber/board/fw_info.py +141 -141
- stubber/board/info.py +183 -183
- stubber/board/main.py +19 -19
- stubber/board/modulelist.txt +247 -247
- stubber/board/pyrightconfig.json +34 -34
- stubber/bulk/mcu_stubber.py +437 -454
- stubber/codemod/_partials/__init__.py +48 -48
- stubber/codemod/_partials/db_main.py +147 -147
- stubber/codemod/_partials/lvgl_main.py +77 -77
- stubber/codemod/_partials/modules_reader.py +80 -80
- stubber/codemod/add_comment.py +53 -53
- stubber/codemod/add_method.py +65 -65
- stubber/codemod/board.py +317 -317
- stubber/codemod/enrich.py +151 -145
- stubber/codemod/merge_docstub.py +284 -284
- stubber/codemod/modify_list.py +54 -54
- stubber/codemod/utils.py +56 -56
- stubber/commands/build_cmd.py +94 -94
- stubber/commands/cli.py +49 -55
- stubber/commands/clone_cmd.py +78 -78
- stubber/commands/config_cmd.py +29 -29
- stubber/commands/enrich_folder_cmd.py +71 -71
- stubber/commands/get_core_cmd.py +71 -71
- stubber/commands/get_docstubs_cmd.py +92 -89
- stubber/commands/get_frozen_cmd.py +117 -114
- stubber/commands/get_mcu_cmd.py +102 -61
- stubber/commands/merge_cmd.py +66 -66
- stubber/commands/publish_cmd.py +118 -118
- stubber/commands/stub_cmd.py +31 -31
- stubber/commands/switch_cmd.py +62 -62
- stubber/commands/variants_cmd.py +48 -48
- stubber/cst_transformer.py +178 -178
- stubber/data/board_info.csv +193 -193
- stubber/data/board_info.json +1729 -1729
- stubber/data/micropython_tags.csv +15 -15
- stubber/data/requirements-core-micropython.txt +38 -38
- stubber/data/requirements-core-pycopy.txt +39 -39
- stubber/downloader.py +37 -36
- stubber/freeze/common.py +72 -68
- stubber/freeze/freeze_folder.py +69 -69
- stubber/freeze/freeze_manifest_2.py +126 -113
- stubber/freeze/get_frozen.py +131 -127
- stubber/get_cpython.py +112 -101
- stubber/get_lobo.py +59 -59
- stubber/minify.py +423 -419
- stubber/publish/bump.py +86 -86
- stubber/publish/candidates.py +275 -256
- stubber/publish/database.py +18 -18
- stubber/publish/defaults.py +40 -40
- stubber/publish/enums.py +24 -24
- stubber/publish/helpers.py +29 -29
- stubber/publish/merge_docstubs.py +136 -130
- stubber/publish/missing_class_methods.py +51 -49
- stubber/publish/package.py +150 -146
- stubber/publish/pathnames.py +51 -51
- stubber/publish/publish.py +120 -120
- stubber/publish/pypi.py +42 -38
- stubber/publish/stubpackage.py +1055 -1027
- stubber/rst/__init__.py +9 -9
- stubber/rst/classsort.py +78 -77
- stubber/rst/lookup.py +533 -530
- stubber/rst/output_dict.py +401 -401
- stubber/rst/reader.py +814 -814
- stubber/rst/report_return.py +77 -69
- stubber/rst/rst_utils.py +541 -540
- stubber/stubber.py +38 -38
- stubber/stubs_from_docs.py +90 -90
- stubber/tools/manifestfile.py +654 -654
- stubber/tools/readme.md +6 -6
- stubber/update_fallback.py +117 -117
- stubber/update_module_list.py +123 -123
- stubber/utils/__init__.py +6 -6
- stubber/utils/config.py +137 -125
- stubber/utils/makeversionhdr.py +54 -54
- stubber/utils/manifest.py +90 -90
- stubber/utils/post.py +80 -79
- stubber/utils/repos.py +156 -150
- stubber/utils/stubmaker.py +139 -139
- stubber/utils/typed_config_toml.py +80 -77
- stubber/variants.py +106 -106
- micropython_stubber-1.23.1.dist-info/RECORD +0 -159
- micropython_stubber-1.23.1.dist-info/entry_points.txt +0 -3
- mpflash/basicgit.py +0 -288
- {micropython_stubber-1.23.1.dist-info → micropython_stubber-1.23.2.dist-info}/WHEEL +0 -0
stubber/codemod/merge_docstub.py
CHANGED
@@ -1,284 +1,284 @@
|
|
1
|
-
# sourcery skip: snake-case-functions
|
2
|
-
"""Merge documentation and type information from from the docstubs into a board stub"""
|
3
|
-
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
4
|
-
#
|
5
|
-
# This source code is licensed under the MIT license found in the
|
6
|
-
# LICENSE file in the root directory of this source tree.
|
7
|
-
#
|
8
|
-
import argparse
|
9
|
-
from pathlib import Path
|
10
|
-
from typing import Dict, List, Optional, Tuple, Union
|
11
|
-
|
12
|
-
import libcst as cst
|
13
|
-
from libcst.codemod import CodemodContext, VisitorBasedCodemodCommand
|
14
|
-
from libcst.codemod.visitors import AddImportsVisitor, GatherImportsVisitor, ImportItem
|
15
|
-
from libcst.helpers.module import insert_header_comments
|
16
|
-
from
|
17
|
-
|
18
|
-
from stubber.cst_transformer import (
|
19
|
-
MODULE_KEY,
|
20
|
-
StubTypingCollector,
|
21
|
-
TypeInfo,
|
22
|
-
update_def_docstr,
|
23
|
-
update_module_docstr,
|
24
|
-
)
|
25
|
-
|
26
|
-
##########################################################################################
|
27
|
-
# # log = logging.getLogger(__name__)
|
28
|
-
#########################################################################################
|
29
|
-
empty_module = cst.parse_module("")
|
30
|
-
|
31
|
-
|
32
|
-
class MergeCommand(VisitorBasedCodemodCommand):
|
33
|
-
"""
|
34
|
-
A libcst transformer that merges the type-rich information from a doc-stub into
|
35
|
-
a firmware stub.
|
36
|
-
The resulting file will contain information from both sources.
|
37
|
-
|
38
|
-
- module docstring - from source
|
39
|
-
|
40
|
-
- function parameters and types - from docstubs
|
41
|
-
- function return types - from docstubs
|
42
|
-
- function docstrings - from source
|
43
|
-
|
44
|
-
"""
|
45
|
-
|
46
|
-
DESCRIPTION: str = "Merge the type-rich information from a doc-stub into a firmware stub"
|
47
|
-
|
48
|
-
@staticmethod
|
49
|
-
def add_args(arg_parser: argparse.ArgumentParser) -> None:
|
50
|
-
"""Add command-line args that a user can specify for running this codemod."""
|
51
|
-
|
52
|
-
arg_parser.add_argument(
|
53
|
-
# "-sf",
|
54
|
-
"--stubfile",
|
55
|
-
dest="docstub_file",
|
56
|
-
metavar="PATH",
|
57
|
-
help="The path to the doc-stub file",
|
58
|
-
type=str,
|
59
|
-
required=True,
|
60
|
-
)
|
61
|
-
|
62
|
-
def __init__(self, context: CodemodContext, docstub_file: Union[Path, str]) -> None:
|
63
|
-
"""initialize the base class with context, and save our args."""
|
64
|
-
super().__init__(context)
|
65
|
-
self.replace_functiondef_with_classdef = True
|
66
|
-
# stack for storing the canonical name of the current function/method
|
67
|
-
self.stack: List[str] = []
|
68
|
-
# stubfile is the path to the doc-stub file
|
69
|
-
self.docstub_path = Path(docstub_file)
|
70
|
-
# read the stub file from the path
|
71
|
-
self.docstub_source = self.docstub_path.read_text(encoding="utf-8")
|
72
|
-
# store the annotations
|
73
|
-
self.annotations: Dict[
|
74
|
-
Tuple[str, ...], # key: tuple of canonical class/function name
|
75
|
-
Union[TypeInfo, str], # value: TypeInfo
|
76
|
-
] = {}
|
77
|
-
self.comments: List[str] = []
|
78
|
-
|
79
|
-
self.stub_imports: Dict[str, ImportItem] = {}
|
80
|
-
self.all_imports: List[Union[cst.Import, cst.ImportFrom]] = []
|
81
|
-
# parse the doc-stub file
|
82
|
-
if self.docstub_source:
|
83
|
-
try:
|
84
|
-
# parse the doc-stub file
|
85
|
-
stub_tree = cst.parse_module(self.docstub_source)
|
86
|
-
except cst.ParserSyntaxError as e:
|
87
|
-
log.error(f"Error parsing {self.docstub_path}: {e}")
|
88
|
-
raise ValueError(f"Error parsing {self.docstub_path}: {e}") from e
|
89
|
-
# create the collectors
|
90
|
-
typing_collector = StubTypingCollector()
|
91
|
-
import_collector = GatherImportsVisitor(context)
|
92
|
-
# visit the doc-stub file with all collectors
|
93
|
-
stub_tree.visit(typing_collector)
|
94
|
-
self.annotations = typing_collector.annotations
|
95
|
-
self.comments = typing_collector.comments
|
96
|
-
# Store the imports that were added to the stub file
|
97
|
-
stub_tree.visit(import_collector)
|
98
|
-
self.stub_imports = import_collector.symbol_mapping
|
99
|
-
self.all_imports = import_collector.all_imports
|
100
|
-
|
101
|
-
# ------------------------------------------------------------------------
|
102
|
-
|
103
|
-
def leave_Module(self, original_node: cst.Module, updated_node: cst.Module) -> cst.Module:
|
104
|
-
"""
|
105
|
-
This method is responsible for updating the module node after processing it in the codemod.
|
106
|
-
It performs the following tasks:
|
107
|
-
1. Adds any needed imports from the doc-stub.
|
108
|
-
2. Adds `from module import *` from the doc-stub.
|
109
|
-
3. Updates the module docstring.
|
110
|
-
4. Updates the comments in the module.
|
111
|
-
|
112
|
-
:param original_node: The original module node.
|
113
|
-
:param updated_node: The updated module node after processing.
|
114
|
-
:return: The updated module node.
|
115
|
-
"""
|
116
|
-
# --------------------------------------------------------------------
|
117
|
-
# add any needed imports from the doc-stub
|
118
|
-
for k in self.stub_imports.keys():
|
119
|
-
imp = self.stub_imports[k]
|
120
|
-
log.trace(f"add: import {k} = {imp}")
|
121
|
-
AddImportsVisitor.add_needed_import(
|
122
|
-
self.context,
|
123
|
-
module=imp.module_name,
|
124
|
-
obj=imp.obj_name,
|
125
|
-
asname=imp.alias,
|
126
|
-
relative=imp.relative,
|
127
|
-
)
|
128
|
-
|
129
|
-
# add `from module import *` from the doc-stub
|
130
|
-
# FIXME: this cases a problem if there is also a 'from module import foobar' in the firmware stub
|
131
|
-
# also all comments get removed from the import
|
132
|
-
if self.all_imports:
|
133
|
-
for imp in self.all_imports:
|
134
|
-
if isinstance(imp, cst.ImportFrom):
|
135
|
-
# perhaps this is an import from *
|
136
|
-
if isinstance(imp.names, cst.ImportStar):
|
137
|
-
# bit of a hack to get the full module name
|
138
|
-
empty_mod = cst.parse_module("")
|
139
|
-
full_module_name = empty_mod.code_for_node(imp.module) # type: ignore
|
140
|
-
log.trace(f"add: from {full_module_name} import *")
|
141
|
-
AddImportsVisitor.add_needed_import(
|
142
|
-
self.context,
|
143
|
-
module=full_module_name,
|
144
|
-
obj="*",
|
145
|
-
)
|
146
|
-
# --------------------------------------------------------------------
|
147
|
-
# update the docstring.
|
148
|
-
if MODULE_KEY not in self.annotations:
|
149
|
-
return updated_node
|
150
|
-
|
151
|
-
# update/replace module docstrings
|
152
|
-
# todo: or should we add / merge the docstrings?
|
153
|
-
docstub_docstr = self.annotations[MODULE_KEY]
|
154
|
-
assert isinstance(docstub_docstr, str)
|
155
|
-
src_docstr = original_node.get_docstring() or ""
|
156
|
-
if src_docstr or docstub_docstr:
|
157
|
-
if docstub_docstr.strip() != src_docstr.strip():
|
158
|
-
if src_docstr:
|
159
|
-
new_docstr = f'"""\n' + docstub_docstr + "\n\n---\n" + src_docstr + '\n"""'
|
160
|
-
else:
|
161
|
-
new_docstr = f'"""\n' + docstub_docstr + '\n"""'
|
162
|
-
|
163
|
-
docstr_node = cst.SimpleStatementLine(
|
164
|
-
body=[
|
165
|
-
cst.Expr(
|
166
|
-
value=cst.SimpleString(
|
167
|
-
value=new_docstr,
|
168
|
-
)
|
169
|
-
)
|
170
|
-
]
|
171
|
-
)
|
172
|
-
updated_node = update_module_docstr(updated_node, docstr_node)
|
173
|
-
# --------------------------------------------------------------------
|
174
|
-
# update the comments
|
175
|
-
updated_node = insert_header_comments(updated_node, self.comments)
|
176
|
-
|
177
|
-
return updated_node
|
178
|
-
# --------------------------------------------------------------------
|
179
|
-
|
180
|
-
# ------------------------------------------------------------
|
181
|
-
|
182
|
-
def visit_ClassDef(self, node: cst.ClassDef) -> Optional[bool]:
|
183
|
-
"""keep track of the the (class, method) names to the stack"""
|
184
|
-
self.stack.append(node.name.value)
|
185
|
-
|
186
|
-
def leave_ClassDef(
|
187
|
-
self, original_node: cst.ClassDef, updated_node: cst.ClassDef
|
188
|
-
) -> cst.ClassDef:
|
189
|
-
stack_id = tuple(self.stack)
|
190
|
-
self.stack.pop()
|
191
|
-
if stack_id not in self.annotations:
|
192
|
-
# no changes to the class
|
193
|
-
return updated_node
|
194
|
-
# update the firmware_stub from the doc_stub information
|
195
|
-
doc_stub = self.annotations[stack_id]
|
196
|
-
assert not isinstance(doc_stub, str)
|
197
|
-
# first update the docstring
|
198
|
-
updated_node = update_def_docstr(updated_node, doc_stub.docstr_node)
|
199
|
-
# Sometimes the MCU stubs and the doc stubs have different types : FunctionDef / ClassDef
|
200
|
-
# we need to be carefull not to copy over all the annotations if the types are different
|
201
|
-
if doc_stub.def_type == "classdef":
|
202
|
-
# Same type, we can copy over all the annotations
|
203
|
-
# combine the decorators from the doc-stub and the firmware stub
|
204
|
-
new_decorators = []
|
205
|
-
if doc_stub.decorators:
|
206
|
-
new_decorators.extend(doc_stub.decorators)
|
207
|
-
if updated_node.decorators:
|
208
|
-
new_decorators.extend(updated_node.decorators)
|
209
|
-
|
210
|
-
return updated_node.with_changes(
|
211
|
-
decorators=new_decorators,
|
212
|
-
bases=doc_stub.def_node.bases, # type: ignore
|
213
|
-
)
|
214
|
-
else:
|
215
|
-
# Different type: ClassDef != FuncDef ,
|
216
|
-
# for now just return the updated node
|
217
|
-
return updated_node
|
218
|
-
|
219
|
-
# ------------------------------------------------------------------------
|
220
|
-
def visit_FunctionDef(self, node: cst.FunctionDef) -> Optional[bool]:
|
221
|
-
self.stack.append(node.name.value)
|
222
|
-
return True
|
223
|
-
|
224
|
-
def leave_FunctionDef(
|
225
|
-
self, original_node: cst.FunctionDef, updated_node: cst.FunctionDef
|
226
|
-
) -> Union[cst.FunctionDef, cst.ClassDef]:
|
227
|
-
"Update the function Parameters and return type, decorators and docstring"
|
228
|
-
stack_id = tuple(self.stack)
|
229
|
-
self.stack.pop()
|
230
|
-
if stack_id not in self.annotations:
|
231
|
-
# no changes to the function
|
232
|
-
return updated_node
|
233
|
-
# update the firmware_stub from the doc_stub information
|
234
|
-
doc_stub = self.annotations[stack_id]
|
235
|
-
assert not isinstance(doc_stub, str)
|
236
|
-
# first update the docstring
|
237
|
-
updated_node = update_def_docstr(updated_node, doc_stub.docstr_node, doc_stub.def_node)
|
238
|
-
# Sometimes the MCU stubs and the doc stubs have different types : FunctionDef / ClassDef
|
239
|
-
# we need to be carefull not to copy over all the annotations if the types are different
|
240
|
-
if doc_stub.def_type == "funcdef":
|
241
|
-
# Same type, we can copy over the annotations
|
242
|
-
# params that should not be overwritten by the doc-stub ?
|
243
|
-
params_txt = empty_module.code_for_node(original_node.params)
|
244
|
-
overwrite_params = params_txt in [
|
245
|
-
"",
|
246
|
-
"...",
|
247
|
-
"*args, **kwargs",
|
248
|
-
"self",
|
249
|
-
"self, *args, **kwargs",
|
250
|
-
]
|
251
|
-
# return that should not be overwritten by the doc-stub ?
|
252
|
-
overwrite_return = True
|
253
|
-
if original_node.returns:
|
254
|
-
try:
|
255
|
-
overwrite_return = original_node.returns.annotation.value in [ # type: ignore
|
256
|
-
"Incomplete",
|
257
|
-
"Any",
|
258
|
-
"...",
|
259
|
-
]
|
260
|
-
except AttributeError:
|
261
|
-
pass
|
262
|
-
# combine the decorators from the doc-stub and the firmware stub
|
263
|
-
new_decorators = []
|
264
|
-
if doc_stub.decorators:
|
265
|
-
new_decorators.extend(doc_stub.decorators)
|
266
|
-
if updated_node.decorators:
|
267
|
-
new_decorators.extend(updated_node.decorators)
|
268
|
-
|
269
|
-
return updated_node.with_changes(
|
270
|
-
decorators=new_decorators,
|
271
|
-
params=doc_stub.params if overwrite_params else updated_node.params,
|
272
|
-
returns=doc_stub.returns if overwrite_return else updated_node.returns,
|
273
|
-
)
|
274
|
-
|
275
|
-
elif doc_stub.def_type == "classdef":
|
276
|
-
# Different type: ClassDef != FuncDef ,
|
277
|
-
if doc_stub.def_node and self.replace_functiondef_with_classdef:
|
278
|
-
# replace the functiondef with the classdef from the stub file
|
279
|
-
return doc_stub.def_node
|
280
|
-
# for now just return the updated node
|
281
|
-
return updated_node
|
282
|
-
else:
|
283
|
-
# just return the updated node
|
284
|
-
return updated_node
|
1
|
+
# sourcery skip: snake-case-functions
|
2
|
+
"""Merge documentation and type information from from the docstubs into a board stub"""
|
3
|
+
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
4
|
+
#
|
5
|
+
# This source code is licensed under the MIT license found in the
|
6
|
+
# LICENSE file in the root directory of this source tree.
|
7
|
+
#
|
8
|
+
import argparse
|
9
|
+
from pathlib import Path
|
10
|
+
from typing import Dict, List, Optional, Tuple, Union
|
11
|
+
|
12
|
+
import libcst as cst
|
13
|
+
from libcst.codemod import CodemodContext, VisitorBasedCodemodCommand
|
14
|
+
from libcst.codemod.visitors import AddImportsVisitor, GatherImportsVisitor, ImportItem
|
15
|
+
from libcst.helpers.module import insert_header_comments
|
16
|
+
from mpflash.logger import log
|
17
|
+
|
18
|
+
from stubber.cst_transformer import (
|
19
|
+
MODULE_KEY,
|
20
|
+
StubTypingCollector,
|
21
|
+
TypeInfo,
|
22
|
+
update_def_docstr,
|
23
|
+
update_module_docstr,
|
24
|
+
)
|
25
|
+
|
26
|
+
##########################################################################################
|
27
|
+
# # log = logging.getLogger(__name__)
|
28
|
+
#########################################################################################
|
29
|
+
empty_module = cst.parse_module("")
|
30
|
+
|
31
|
+
|
32
|
+
class MergeCommand(VisitorBasedCodemodCommand):
|
33
|
+
"""
|
34
|
+
A libcst transformer that merges the type-rich information from a doc-stub into
|
35
|
+
a firmware stub.
|
36
|
+
The resulting file will contain information from both sources.
|
37
|
+
|
38
|
+
- module docstring - from source
|
39
|
+
|
40
|
+
- function parameters and types - from docstubs
|
41
|
+
- function return types - from docstubs
|
42
|
+
- function docstrings - from source
|
43
|
+
|
44
|
+
"""
|
45
|
+
|
46
|
+
DESCRIPTION: str = "Merge the type-rich information from a doc-stub into a firmware stub"
|
47
|
+
|
48
|
+
@staticmethod
|
49
|
+
def add_args(arg_parser: argparse.ArgumentParser) -> None:
|
50
|
+
"""Add command-line args that a user can specify for running this codemod."""
|
51
|
+
|
52
|
+
arg_parser.add_argument(
|
53
|
+
# "-sf",
|
54
|
+
"--stubfile",
|
55
|
+
dest="docstub_file",
|
56
|
+
metavar="PATH",
|
57
|
+
help="The path to the doc-stub file",
|
58
|
+
type=str,
|
59
|
+
required=True,
|
60
|
+
)
|
61
|
+
|
62
|
+
def __init__(self, context: CodemodContext, docstub_file: Union[Path, str]) -> None:
|
63
|
+
"""initialize the base class with context, and save our args."""
|
64
|
+
super().__init__(context)
|
65
|
+
self.replace_functiondef_with_classdef = True
|
66
|
+
# stack for storing the canonical name of the current function/method
|
67
|
+
self.stack: List[str] = []
|
68
|
+
# stubfile is the path to the doc-stub file
|
69
|
+
self.docstub_path = Path(docstub_file)
|
70
|
+
# read the stub file from the path
|
71
|
+
self.docstub_source = self.docstub_path.read_text(encoding="utf-8")
|
72
|
+
# store the annotations
|
73
|
+
self.annotations: Dict[
|
74
|
+
Tuple[str, ...], # key: tuple of canonical class/function name
|
75
|
+
Union[TypeInfo, str], # value: TypeInfo
|
76
|
+
] = {}
|
77
|
+
self.comments: List[str] = []
|
78
|
+
|
79
|
+
self.stub_imports: Dict[str, ImportItem] = {}
|
80
|
+
self.all_imports: List[Union[cst.Import, cst.ImportFrom]] = []
|
81
|
+
# parse the doc-stub file
|
82
|
+
if self.docstub_source:
|
83
|
+
try:
|
84
|
+
# parse the doc-stub file
|
85
|
+
stub_tree = cst.parse_module(self.docstub_source)
|
86
|
+
except cst.ParserSyntaxError as e:
|
87
|
+
log.error(f"Error parsing {self.docstub_path}: {e}")
|
88
|
+
raise ValueError(f"Error parsing {self.docstub_path}: {e}") from e
|
89
|
+
# create the collectors
|
90
|
+
typing_collector = StubTypingCollector()
|
91
|
+
import_collector = GatherImportsVisitor(context)
|
92
|
+
# visit the doc-stub file with all collectors
|
93
|
+
stub_tree.visit(typing_collector)
|
94
|
+
self.annotations = typing_collector.annotations
|
95
|
+
self.comments = typing_collector.comments
|
96
|
+
# Store the imports that were added to the stub file
|
97
|
+
stub_tree.visit(import_collector)
|
98
|
+
self.stub_imports = import_collector.symbol_mapping
|
99
|
+
self.all_imports = import_collector.all_imports
|
100
|
+
|
101
|
+
# ------------------------------------------------------------------------
|
102
|
+
|
103
|
+
def leave_Module(self, original_node: cst.Module, updated_node: cst.Module) -> cst.Module:
|
104
|
+
"""
|
105
|
+
This method is responsible for updating the module node after processing it in the codemod.
|
106
|
+
It performs the following tasks:
|
107
|
+
1. Adds any needed imports from the doc-stub.
|
108
|
+
2. Adds `from module import *` from the doc-stub.
|
109
|
+
3. Updates the module docstring.
|
110
|
+
4. Updates the comments in the module.
|
111
|
+
|
112
|
+
:param original_node: The original module node.
|
113
|
+
:param updated_node: The updated module node after processing.
|
114
|
+
:return: The updated module node.
|
115
|
+
"""
|
116
|
+
# --------------------------------------------------------------------
|
117
|
+
# add any needed imports from the doc-stub
|
118
|
+
for k in self.stub_imports.keys():
|
119
|
+
imp = self.stub_imports[k]
|
120
|
+
log.trace(f"add: import {k} = {imp}")
|
121
|
+
AddImportsVisitor.add_needed_import(
|
122
|
+
self.context,
|
123
|
+
module=imp.module_name,
|
124
|
+
obj=imp.obj_name,
|
125
|
+
asname=imp.alias,
|
126
|
+
relative=imp.relative,
|
127
|
+
)
|
128
|
+
|
129
|
+
# add `from module import *` from the doc-stub
|
130
|
+
# FIXME: this cases a problem if there is also a 'from module import foobar' in the firmware stub
|
131
|
+
# also all comments get removed from the import
|
132
|
+
if self.all_imports:
|
133
|
+
for imp in self.all_imports:
|
134
|
+
if isinstance(imp, cst.ImportFrom):
|
135
|
+
# perhaps this is an import from *
|
136
|
+
if isinstance(imp.names, cst.ImportStar):
|
137
|
+
# bit of a hack to get the full module name
|
138
|
+
empty_mod = cst.parse_module("")
|
139
|
+
full_module_name = empty_mod.code_for_node(imp.module) # type: ignore
|
140
|
+
log.trace(f"add: from {full_module_name} import *")
|
141
|
+
AddImportsVisitor.add_needed_import(
|
142
|
+
self.context,
|
143
|
+
module=full_module_name,
|
144
|
+
obj="*",
|
145
|
+
)
|
146
|
+
# --------------------------------------------------------------------
|
147
|
+
# update the docstring.
|
148
|
+
if MODULE_KEY not in self.annotations:
|
149
|
+
return updated_node
|
150
|
+
|
151
|
+
# update/replace module docstrings
|
152
|
+
# todo: or should we add / merge the docstrings?
|
153
|
+
docstub_docstr = self.annotations[MODULE_KEY]
|
154
|
+
assert isinstance(docstub_docstr, str)
|
155
|
+
src_docstr = original_node.get_docstring() or ""
|
156
|
+
if src_docstr or docstub_docstr:
|
157
|
+
if docstub_docstr.strip() != src_docstr.strip():
|
158
|
+
if src_docstr:
|
159
|
+
new_docstr = f'"""\n' + docstub_docstr + "\n\n---\n" + src_docstr + '\n"""'
|
160
|
+
else:
|
161
|
+
new_docstr = f'"""\n' + docstub_docstr + '\n"""'
|
162
|
+
|
163
|
+
docstr_node = cst.SimpleStatementLine(
|
164
|
+
body=[
|
165
|
+
cst.Expr(
|
166
|
+
value=cst.SimpleString(
|
167
|
+
value=new_docstr,
|
168
|
+
)
|
169
|
+
)
|
170
|
+
]
|
171
|
+
)
|
172
|
+
updated_node = update_module_docstr(updated_node, docstr_node)
|
173
|
+
# --------------------------------------------------------------------
|
174
|
+
# update the comments
|
175
|
+
updated_node = insert_header_comments(updated_node, self.comments)
|
176
|
+
|
177
|
+
return updated_node
|
178
|
+
# --------------------------------------------------------------------
|
179
|
+
|
180
|
+
# ------------------------------------------------------------
|
181
|
+
|
182
|
+
def visit_ClassDef(self, node: cst.ClassDef) -> Optional[bool]:
|
183
|
+
"""keep track of the the (class, method) names to the stack"""
|
184
|
+
self.stack.append(node.name.value)
|
185
|
+
|
186
|
+
def leave_ClassDef(
|
187
|
+
self, original_node: cst.ClassDef, updated_node: cst.ClassDef
|
188
|
+
) -> cst.ClassDef:
|
189
|
+
stack_id = tuple(self.stack)
|
190
|
+
self.stack.pop()
|
191
|
+
if stack_id not in self.annotations:
|
192
|
+
# no changes to the class
|
193
|
+
return updated_node
|
194
|
+
# update the firmware_stub from the doc_stub information
|
195
|
+
doc_stub = self.annotations[stack_id]
|
196
|
+
assert not isinstance(doc_stub, str)
|
197
|
+
# first update the docstring
|
198
|
+
updated_node = update_def_docstr(updated_node, doc_stub.docstr_node)
|
199
|
+
# Sometimes the MCU stubs and the doc stubs have different types : FunctionDef / ClassDef
|
200
|
+
# we need to be carefull not to copy over all the annotations if the types are different
|
201
|
+
if doc_stub.def_type == "classdef":
|
202
|
+
# Same type, we can copy over all the annotations
|
203
|
+
# combine the decorators from the doc-stub and the firmware stub
|
204
|
+
new_decorators = []
|
205
|
+
if doc_stub.decorators:
|
206
|
+
new_decorators.extend(doc_stub.decorators)
|
207
|
+
if updated_node.decorators:
|
208
|
+
new_decorators.extend(updated_node.decorators)
|
209
|
+
|
210
|
+
return updated_node.with_changes(
|
211
|
+
decorators=new_decorators,
|
212
|
+
bases=doc_stub.def_node.bases, # type: ignore
|
213
|
+
)
|
214
|
+
else:
|
215
|
+
# Different type: ClassDef != FuncDef ,
|
216
|
+
# for now just return the updated node
|
217
|
+
return updated_node
|
218
|
+
|
219
|
+
# ------------------------------------------------------------------------
|
220
|
+
def visit_FunctionDef(self, node: cst.FunctionDef) -> Optional[bool]:
|
221
|
+
self.stack.append(node.name.value)
|
222
|
+
return True
|
223
|
+
|
224
|
+
def leave_FunctionDef(
|
225
|
+
self, original_node: cst.FunctionDef, updated_node: cst.FunctionDef
|
226
|
+
) -> Union[cst.FunctionDef, cst.ClassDef]:
|
227
|
+
"Update the function Parameters and return type, decorators and docstring"
|
228
|
+
stack_id = tuple(self.stack)
|
229
|
+
self.stack.pop()
|
230
|
+
if stack_id not in self.annotations:
|
231
|
+
# no changes to the function
|
232
|
+
return updated_node
|
233
|
+
# update the firmware_stub from the doc_stub information
|
234
|
+
doc_stub = self.annotations[stack_id]
|
235
|
+
assert not isinstance(doc_stub, str)
|
236
|
+
# first update the docstring
|
237
|
+
updated_node = update_def_docstr(updated_node, doc_stub.docstr_node, doc_stub.def_node)
|
238
|
+
# Sometimes the MCU stubs and the doc stubs have different types : FunctionDef / ClassDef
|
239
|
+
# we need to be carefull not to copy over all the annotations if the types are different
|
240
|
+
if doc_stub.def_type == "funcdef":
|
241
|
+
# Same type, we can copy over the annotations
|
242
|
+
# params that should not be overwritten by the doc-stub ?
|
243
|
+
params_txt = empty_module.code_for_node(original_node.params)
|
244
|
+
overwrite_params = params_txt in [
|
245
|
+
"",
|
246
|
+
"...",
|
247
|
+
"*args, **kwargs",
|
248
|
+
"self",
|
249
|
+
"self, *args, **kwargs",
|
250
|
+
]
|
251
|
+
# return that should not be overwritten by the doc-stub ?
|
252
|
+
overwrite_return = True
|
253
|
+
if original_node.returns:
|
254
|
+
try:
|
255
|
+
overwrite_return = original_node.returns.annotation.value in [ # type: ignore
|
256
|
+
"Incomplete",
|
257
|
+
"Any",
|
258
|
+
"...",
|
259
|
+
]
|
260
|
+
except AttributeError:
|
261
|
+
pass
|
262
|
+
# combine the decorators from the doc-stub and the firmware stub
|
263
|
+
new_decorators = []
|
264
|
+
if doc_stub.decorators:
|
265
|
+
new_decorators.extend(doc_stub.decorators)
|
266
|
+
if updated_node.decorators:
|
267
|
+
new_decorators.extend(updated_node.decorators)
|
268
|
+
|
269
|
+
return updated_node.with_changes(
|
270
|
+
decorators=new_decorators,
|
271
|
+
params=doc_stub.params if overwrite_params else updated_node.params,
|
272
|
+
returns=doc_stub.returns if overwrite_return else updated_node.returns,
|
273
|
+
)
|
274
|
+
|
275
|
+
elif doc_stub.def_type == "classdef":
|
276
|
+
# Different type: ClassDef != FuncDef ,
|
277
|
+
if doc_stub.def_node and self.replace_functiondef_with_classdef:
|
278
|
+
# replace the functiondef with the classdef from the stub file
|
279
|
+
return doc_stub.def_node
|
280
|
+
# for now just return the updated node
|
281
|
+
return updated_node
|
282
|
+
else:
|
283
|
+
# just return the updated node
|
284
|
+
return updated_node
|