omdev 0.0.0.dev285__tar.gz → 0.0.0.dev286__tar.gz

{omdev-0.0.0.dev285/omdev.egg-info → omdev-0.0.0.dev286}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev285
+Version: 0.0.0.dev286
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev285
+Requires-Dist: omlish==0.0.0.dev286
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev285 → omdev-0.0.0.dev286}/omdev/.manifests.json

@@ -123,7 +123,7 @@
     "module": ".py.attrdocs",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/attrdocs.py",
-    "line": 146,
+    "line": 155,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/attrdocs",
@@ -159,7 +159,7 @@
     "module": ".py.findimports",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/findimports.py",
-    "line": 87,
+    "line": 89,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/findimports",
@@ -203,6 +203,18 @@
       }
     }
   },
+  {
+    "module": ".py.srcheaders",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/py/srcheaders.py",
+    "line": 65,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "py/srcheaders",
+        "mod_name": "omdev.py.srcheaders"
+      }
+    }
+  },
   {
     "module": ".py.tools.importscan",
     "attr": "_CLI_MODULE",

{omdev-0.0.0.dev285 → omdev-0.0.0.dev286}/omdev/py/attrdocs.py

@@ -44,7 +44,8 @@ class _AttrDocAstVisitor(ast.NodeVisitor):
         self._tok_lines = tok_lines
 
         self._attr_docs: dict[str, AttrDoc] = {}
-        self._target: str | None = None
+        self._class_stack: list[str] = []
+        self._attr_target: str | None = None
         self._prev_node_type: type[ast.AST] | None = None
 
     @property
@@ -63,6 +64,13 @@ class _AttrDocAstVisitor(ast.NodeVisitor):
 
     #
 
+    def visit_ClassDef(self, node: ast.ClassDef) -> ta.Any:
+        self._class_stack.append(node.name)
+        self.generic_visit(node)
+        check.equal(self._class_stack.pop(), node.name)
+
+    #
+
     @staticmethod
     def _comment_tok_src(tok: tks.Token) -> str:
         check.state(tok.name == 'COMMENT')
@@ -70,8 +78,8 @@ class _AttrDocAstVisitor(ast.NodeVisitor):
         check.state(tc[0] == '#')
         return tc[1:].lstrip()
 
-    def _set_target(self, node: ast.Name) -> None:
-        self._target = node.id
+    def _set_attr_target(self, node: ast.Name) -> None:
+        self._attr_target = '.'.join([*self._class_stack, node.id])
 
         ad = _EMPTY_ATTR_DOC
 
@@ -97,15 +105,15 @@ class _AttrDocAstVisitor(ast.NodeVisitor):
                 ad = dc.replace(ad, preceding_comment='\n'.join(reversed(pll)))
 
         if ad is not _EMPTY_ATTR_DOC:
-            self._attr_docs[node.id] = ad
+            self._attr_docs[self._attr_target] = ad
 
     def visit_AnnAssign(self, node: ast.AnnAssign) -> ta.Any:
         if isinstance(target := node.target, ast.Name):
-            self._set_target(target)
+            self._set_attr_target(target)
 
     def visit_Assign(self, node: ast.Assign) -> ta.Any:
         if len(node.targets) == 1 and isinstance(target := node.targets[0], ast.Name):
-            self._set_target(target)  # noqa
+            self._set_attr_target(target)  # noqa
 
     #
 
@@ -115,12 +123,13 @@ class _AttrDocAstVisitor(ast.NodeVisitor):
                 isinstance(node.value.value, str) and
                 self._prev_node_type in (ast.Assign, ast.AnnAssign)
         ):
-            docstring = inspect.cleandoc(node.value.value)
-            if self._target:
-                ex = self._attr_docs.get(self._target, _EMPTY_ATTR_DOC)
+            if self._attr_target:
+                docstring = inspect.cleandoc(node.value.value)
+                ex = self._attr_docs.get(self._attr_target, _EMPTY_ATTR_DOC)
                 check.none(ex.docstring)
-                self._attr_docs[self._target] = dc.replace(ex, docstring=docstring)
-            self._target = None
+                self._attr_docs[self._attr_target] = dc.replace(ex, docstring=docstring)
+
+            self._attr_target = None
 
 
 def extract_attr_docs(src: str) -> ta.Mapping[str, AttrDoc]:
@@ -163,15 +172,25 @@ if __name__ == '__main__':
         with open(args.file) as f:
             src = f.read()
 
+        #
+
         attr_docs = extract_attr_docs(src)
 
         #
 
+        nested_attr_docs: dict = {}
+        for k, v in attr_docs.items():
+            cur = nested_attr_docs
+            *kps, ekp = [f'.{kp}' for kp in k.split('.')]
+            for kp in kps:
+                cur = cur.setdefault(kp, {})
+            check.not_in(ekp, cur)
+            cur[ekp] = {k: v for k, v in dc.asdict(v).items() if v}
+
+        #
+
         import json
 
-        print(json.dumps({
-            a: {k: v for k, v in dc.asdict(ad).items() if v}
-            for a, ad in sorted(attr_docs.items(), key=lambda t: t[0])
-        }))
+        print(json.dumps(nested_attr_docs, indent=2))
 
     _main()

{omdev-0.0.0.dev285 → omdev-0.0.0.dev286}/omdev/py/findimports.py

@@ -2,8 +2,10 @@
 # @omlish-script
 """
 TODO:
+ - !! FIX: from omlish import lang - try lang as a subpackage
  - multiple commands:
   - dumb cmp (a = set(sys.modules); import ...; print(set(sys.modules) - a)
+ - graphviz
 """
 import ast
 import importlib.machinery

omdev-0.0.0.dev286/omdev/py/srcheaders.py

@@ -0,0 +1,98 @@
+import ast
+import dataclasses as dc
+import typing as ta
+
+from omlish.lite.check import check
+
+from ..tokens import all as tks
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class PyHeaderLine:
+    kind: ta.Literal['comment', 'string']
+    src: str
+    content: str
+    line: int
+    col: int
+
+
+def get_py_header_lines(src: str) -> list[PyHeaderLine]:
+    ret: list[PyHeaderLine] = []
+
+    src_toks = tks.iter_src_to_tokens(src)
+    hdr_toks = (
+        tok
+        for tok in src_toks
+        if tok.name == 'COMMENT' or
+        (tok.name not in tks.WS_NAMES and tok.name != 'NL')
+    )
+
+    for tok in hdr_toks:
+        if tok.name == 'COMMENT':
+            cs = tok.src.lstrip()
+            check.state(cs.startswith('#'))
+            cs = cs[1:].lstrip()
+            ret.append(PyHeaderLine(
+                kind='comment',
+                src=tok.src,
+                content=cs,
+                line=check.isinstance(tok.line, int),
+                col=check.isinstance(tok.utf8_byte_offset, int),
+            ))
+
+        elif tok.name == 'STRING':
+            ss = ast.literal_eval(tok.src)
+            ret.append(PyHeaderLine(
+                kind='string',
+                src=tok.src,
+                content=ss,
+                line=check.isinstance(tok.line, int),
+                col=check.isinstance(tok.utf8_byte_offset, int),
+            ))
+
+        else:
+            break
+
+    return ret
+
+
+##
+
+
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/srcheaders',
+    'mod_name': __name__,
+}}
+
+
+if __name__ == '__main__':
+    def _main() -> None:
+        import argparse
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('file')
+        args = parser.parse_args()
+
+        #
+
+        with open(args.file) as f:
+            src = f.read()
+
+        #
+
+        hls = get_py_header_lines(src)
+
+        #
+
+        import json
+
+        print(json.dumps(
+            [dc.asdict(hl) for hl in hls],
+            indent=2,
+        ))
+
+    _main()

{omdev-0.0.0.dev285 → omdev-0.0.0.dev286}/omdev/scripts/ci.py

@@ -1096,6 +1096,9 @@ log = logging.getLogger(__name__)
 # ../../../omlish/lite/maybes.py
 
 
+##
+
+
 class Maybe(ta.Generic[T]):
     @property
     @abc.abstractmethod
@@ -1136,6 +1139,19 @@ class _Maybe(Maybe[T], tuple):
 Maybe._empty = tuple.__new__(_Maybe, ())  # noqa
 
 
+##
+
+
+@functools.singledispatch
+def as_maybe(obj: ta.Any) -> Maybe:
+    raise TypeError(obj)
+
+
+@as_maybe.register
+def _(obj: Maybe) -> Maybe:
+    return obj
+
+
 ########################################
 # ../../../omlish/lite/reflect.py
 

{omdev-0.0.0.dev285 → omdev-0.0.0.dev286}/omdev/scripts/interp.py

@@ -1069,6 +1069,9 @@ json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON
 # ../../../omlish/lite/maybes.py
 
 
+##
+
+
 class Maybe(ta.Generic[T]):
     @property
     @abc.abstractmethod
@@ -1109,6 +1112,19 @@ class _Maybe(Maybe[T], tuple):
 Maybe._empty = tuple.__new__(_Maybe, ())  # noqa
 
 
+##
+
+
+@functools.singledispatch
+def as_maybe(obj: ta.Any) -> Maybe:
+    raise TypeError(obj)
+
+
+@as_maybe.register
+def _(obj: Maybe) -> Maybe:
+    return obj
+
+
 ########################################
 # ../../../omlish/lite/reflect.py
 

{omdev-0.0.0.dev285 → omdev-0.0.0.dev286}/omdev/scripts/pyproject.py

@@ -2376,6 +2376,9 @@ log = logging.getLogger(__name__)
 # ../../../omlish/lite/maybes.py
 
 
+##
+
+
 class Maybe(ta.Generic[T]):
     @property
     @abc.abstractmethod
@@ -2416,6 +2419,19 @@ class _Maybe(Maybe[T], tuple):
 Maybe._empty = tuple.__new__(_Maybe, ())  # noqa
 
 
+##
+
+
+@functools.singledispatch
+def as_maybe(obj: ta.Any) -> Maybe:
+    raise TypeError(obj)
+
+
+@as_maybe.register
+def _(obj: Maybe) -> Maybe:
+    return obj
+
+
 ########################################
 # ../../../omlish/lite/reflect.py
 

{omdev-0.0.0.dev285 → omdev-0.0.0.dev286}/omdev/tokens/all.py

@@ -30,6 +30,7 @@ UNIMPORTANT_WS = TokenNames.UNIMPORTANT_WS  # noqa
 NON_CODING_TOKENS = TokenNames.NON_CODING_TOKENS  # noqa
 
 curly_escape = Tokenization.curly_escape  # noqa
+iter_src_to_tokens = Tokenization.iter_src_to_tokens  # noqa
 src_to_tokens = Tokenization.src_to_tokens  # noqa
 parse_string_literal = Tokenization.parse_string_literal  # noqa
 tokens_to_src = Tokenization.tokens_to_src  # noqa

{omdev-0.0.0.dev285 → omdev-0.0.0.dev286}/omdev/tokens/tokenizert.py

@@ -82,13 +82,12 @@ class Tokenization:
             return (s, '', '')
 
     @classmethod
-    def src_to_tokens(cls, src: str) -> ta.List[Token]:
+    def iter_src_to_tokens(cls, src: str) -> ta.Iterator[Token]:
         tokenize_target = io.StringIO(src)
         lines = ('', *tokenize_target)
 
         tokenize_target.seek(0)
 
-        tokens = []
         last_line = 1
         last_col = 0
         end_offset = 0
@@ -106,20 +105,20 @@ class Tokenization:
                 while cls._ESCAPED_NL_RE.search(newtok):
                     ws, nl, newtok = cls._re_partition(cls._ESCAPED_NL_RE, newtok)
                     if ws:
-                        tokens.append(Token(TokenNames.UNIMPORTANT_WS, ws, last_line, end_offset))
+                        yield Token(TokenNames.UNIMPORTANT_WS, ws, last_line, end_offset)
                         end_offset += len(ws.encode())
-                    tokens.append(Token(TokenNames.ESCAPED_NL, nl, last_line, end_offset))
+                    yield Token(TokenNames.ESCAPED_NL, nl, last_line, end_offset)
                     end_offset = 0
                     last_line += 1
                 if newtok:
-                    tokens.append(Token(TokenNames.UNIMPORTANT_WS, newtok, sline, 0))
+                    yield Token(TokenNames.UNIMPORTANT_WS, newtok, sline, 0)
                     end_offset = len(newtok.encode())
                 else:
                     end_offset = 0
 
             elif scol > last_col:
                 newtok = line[last_col:scol]
-                tokens.append(Token(TokenNames.UNIMPORTANT_WS, newtok, sline, end_offset))
+                yield Token(TokenNames.UNIMPORTANT_WS, newtok, sline, end_offset)
                 end_offset += len(newtok.encode())
 
             tok_name = tokenize.tok_name[tok_type]
@@ -130,14 +129,16 @@ class Tokenization:
                     ecol += len(new_tok_text) - len(tok_text)
                     tok_text = new_tok_text
 
-            tokens.append(Token(tok_name, tok_text, sline, end_offset))
+            yield Token(tok_name, tok_text, sline, end_offset)
             last_line, last_col = eline, ecol
             if sline != eline:
                 end_offset = len(lines[last_line][:last_col].encode())
             else:
                 end_offset += len(tok_text.encode())
 
-        return tokens
+    @classmethod
+    def src_to_tokens(cls, src: str) -> ta.List[Token]:
+        return list(cls.iter_src_to_tokens(src))
 
     @classmethod
     def parse_string_literal(cls, src: str) -> ta.Tuple[str, str]:

{omdev-0.0.0.dev285 → omdev-0.0.0.dev286/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev285
+Version: 0.0.0.dev286
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev285
+Requires-Dist: omlish==0.0.0.dev286
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev285 → omdev-0.0.0.dev286}/omdev.egg-info/SOURCES.txt

@@ -208,6 +208,7 @@ omdev/py/attrdocs.py
 omdev/py/bracepy.py
 omdev/py/classdot.py
 omdev/py/findimports.py
+omdev/py/srcheaders.py
 omdev/py/scripts/__init__.py
 omdev/py/scripts/bumpversion.py
 omdev/py/scripts/execrss.py

{omdev-0.0.0.dev285 → omdev-0.0.0.dev286}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev285
+omlish==0.0.0.dev286
 
 [all]
 black~=25.1

{omdev-0.0.0.dev285 → omdev-0.0.0.dev286}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev285'
+version = '0.0.0.dev286'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev285',
+    'omlish == 0.0.0.dev286',
 ]
 
 [project.optional-dependencies]