omdev 0.0.0.dev547__tar.gz → 0.0.0.dev548__tar.gz

{omdev-0.0.0.dev547/omdev.egg-info → omdev-0.0.0.dev548}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev547
+Version: 0.0.0.dev548
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev547
+Requires-Dist: omlish==0.0.0.dev548
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev547 → omdev-0.0.0.dev548}/omdev/java/cli.py

@@ -1,6 +1,7 @@
 """
 TODO:
  - JAVA_HOME
+ - pomgen colon-sep dep type/scope
 
 See:
  - https://github.com/jbangdev/jbang
@@ -19,6 +20,7 @@ from omlish.argparse import all as ap
 from .. import intellij as ij
 from .. import magic
 from . import pomgen as pg
+from .utils import insert_before_first_non_header_line
 
 
 ##
@@ -70,7 +72,7 @@ def build_maven_project(
         if require_symlink:
             raise ValueError(f'Cannot symlink source file, no package specified.')
         group_id = DEFAULT_PROJECT_GROUP_ID
-        src = f'package {group_id};\n\n{src}'
+        src = insert_before_first_non_header_line(src, f'package {group_id};\n')
         can_symlink = False
 
     check.non_empty_str(group_id)

omdev-0.0.0.dev548/omdev/java/utils.py

@@ -0,0 +1,61 @@
+import re
+
+
+##
+
+
+_LINE_RE = re.compile(r'.*?(?:\r\n|\n|\r|$)')
+
+
+def insert_before_first_non_header_line(java_src: str, new_line: str) -> str:
+    """
+    Insert `new_line` as its own line immediately before the first non-header line in `java_src`.
+
+    A "header" line is:
+      - blank / whitespace-only
+      - a `// ...` line (optionally indented)
+      - a `/* ... */` block-comment line, including multi-line block comments (optionally indented)
+
+    Assumptions:
+      - `java_src` contains valid Java source.
+      - If a line ends a block comment, it does not also contain code after `*/`.
+      - `new_line` is a single logical line; any trailing newline chars are ignored.
+    """
+
+    # Pick a newline style to use for the inserted line.
+    m = re.search(r'\r\n|\n|\r', java_src)
+    nl = m.group(0) if m else '\n'
+
+    in_block_comment = False
+
+    for m in _LINE_RE.finditer(java_src):
+        line = m.group(0)
+        if line == '':
+            break
+
+        stripped = line.lstrip()
+
+        if in_block_comment:
+            if '*/' in stripped:
+                in_block_comment = False
+            continue
+
+        if stripped == '' or stripped in ('\n', '\r', '\r\n'):
+            continue
+
+        if stripped.startswith('//'):
+            continue
+
+        if stripped.startswith('/*'):
+            if '*/' not in stripped:
+                in_block_comment = True
+            continue
+
+        # First non-header line.
+        return java_src[:m.start()] + new_line + nl + java_src[m.start():]
+
+    # File contains only header lines, or is empty: append at the end.
+    if not java_src:
+        return new_line + nl
+
+    return java_src + ('' if java_src.endswith(('\r\n', '\n', '\r')) else nl) + new_line + nl

{omdev-0.0.0.dev547 → omdev-0.0.0.dev548/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev547
+Version: 0.0.0.dev548
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev547
+Requires-Dist: omlish==0.0.0.dev548
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev547 → omdev-0.0.0.dev548}/omdev.egg-info/SOURCES.txt

@@ -254,6 +254,7 @@ omdev/java/__init__.py
 omdev/java/__main__.py
 omdev/java/cli.py
 omdev/java/pomgen.py
+omdev/java/utils.py
 omdev/java/xml.py
 omdev/magic/__init__.py
 omdev/magic/__main__.py

{omdev-0.0.0.dev547 → omdev-0.0.0.dev548}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev547
+omlish==0.0.0.dev548
 
 [all]
 black~=26.3

{omdev-0.0.0.dev547 → omdev-0.0.0.dev548}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev547'
+version = '0.0.0.dev548'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev547',
+    'omlish == 0.0.0.dev548',
 ]
 
 [project.optional-dependencies]