preparse 2.0.0.dev10__py3-none-any.whl → 2.0.0.dev12__py3-none-any.whl

preparse/_processing/parsing.py

@@ -124,22 +124,11 @@ def parse_generator(
     yield last
 
 
-def parse_islong(
-    arg: str,
-    *,
-    allowslong: bool,
-    allowsshort: bool,
-) -> bool:
-    if allowslong and allowsshort:
-        return arg.startswith("--")
-    else:
-        return not allowsshort
-
-
 def parse_long(
     arg: str,
     *,
     abbr: Optional[Tuning],
+    allowsshort: bool,
     cause: FunctionType,
     optdict: dict,
 ) -> Long:
@@ -168,6 +157,15 @@ def parse_long(
     (ans.fullkey,) = parts
     if abbr == Tuning.MINIMIZE:
         ans.abbrlen = len(ans.fullkey)
+    if abbr == Tuning.MAXIMIZE:
+        parts = list(optdict.keys())
+        parts.remove(ans.fullkey)
+        ans.abbrlen = parse_minlen(
+            abbr=ans.abbr,
+            allowsshort=allowsshort,
+            joined=ans.joined,
+            keys=tuple(parts),
+        )
     ans.nargs = optdict[ans.fullkey]
     if (ans.nargs == Nargs.NO_ARGUMENT) and (ans.right is not None):
         cause(PUAW, option=ans.fullkey)
@@ -188,18 +186,36 @@ def parse_long_startswith(
     return ans
 
 
+def parse_minlen(
+    *,
+    abbr: str,
+    allowsshort: bool,
+    joined: bool,
+    keys: tuple[str, ...],
+) -> int:
+    m: int
+    n: int
+    m = 2 + allowsshort - joined
+    n = len(abbr)
+    while n >= m and not any(z.startswith(abbr[:n]) for z in keys):
+        n -= 1
+    return n + 1
+
+
 def parse_option(
     arg: str,
     *,
     abbr: Optional[Tuning],
+    allowslong: bool,
+    allowsshort: bool,
     cause: FunctionType,
     optdict: dict,
-    **kwargs: Any,
 ) -> Option:
-    if parse_islong(arg, **kwargs):
+    if (allowslong and arg.startswith("--")) or not allowsshort:
         return parse_long(
             arg,
             abbr=abbr,
+            allowsshort=allowsshort,
             cause=cause,
             optdict=optdict,
         )

preparse/tests/data.toml

@@ -1250701,3 +1250701,201 @@ abbr = 2
 
 [run35319go.optdict]
 --verbose = 0
+
+
+[run35320go]
+bundling = 2
+query = [
+    "--versio",
+]
+solution = [
+    "--vers",
+]
+prog = "run35320go"
+expectsposix = false
+reconcilesorders = false
+allowsshort = true
+allowslong = true
+special = 2
+warnings = []
+abbr = 1
+
+[run35320go.optdict]
+--verbose = 0
+--version = 0
+
+
+[run35321go]
+bundling = 2
+query = [
+    "--verbose",
+]
+solution = [
+    "--verb",
+]
+prog = "run35321go"
+expectsposix = false
+reconcilesorders = false
+allowsshort = true
+allowslong = true
+special = 2
+warnings = []
+abbr = 1
+
+[run35321go.optdict]
+--verbose = 0
+--version = 0
+
+
+
+[run35322go]
+bundling = 2
+query = [
+    "-verbose",
+]
+solution = [
+    "-verb",
+]
+prog = "run35322go"
+expectsposix = false
+reconcilesorders = false
+allowsshort = false
+allowslong = true
+special = 2
+warnings = []
+abbr = 1
+
+[run35322go.optdict]
+-verbose = 0
+-version = 0
+
+
+
+
+[run35323go]
+bundling = 0
+query = [
+    "-verbose",
+]
+solution = [
+    "-v",
+    "-e",
+    "-r",
+    "-b",
+    "-o",
+    "-s",
+    "-e",
+]
+prog = "run35323go"
+expectsposix = false
+reconcilesorders = false
+allowsshort = true
+allowslong = true
+special = 2
+warnings = [
+    "run35323go: invalid option -- 'v'",
+    "run35323go: invalid option -- 'e'",
+    "run35323go: invalid option -- 'r'",
+    "run35323go: invalid option -- 'b'",
+    "run35323go: invalid option -- 'o'",
+    "run35323go: invalid option -- 's'",
+    "run35323go: invalid option -- 'e'",
+]
+abbr = 1
+
+[run35323go.optdict]
+-verbose = 0
+-version = 0
+
+
+[run35324go]
+bundling = 2
+query = [
+    "-verbose",
+]
+solution = [
+    "-verbose",
+]
+prog = "run35324go"
+expectsposix = false
+reconcilesorders = false
+allowsshort = true
+allowslong = true
+special = 2
+warnings = [
+    "run35324go: invalid option -- 'v'",
+    "run35324go: invalid option -- 'e'",
+    "run35324go: invalid option -- 'r'",
+    "run35324go: invalid option -- 'b'",
+    "run35324go: invalid option -- 'o'",
+    "run35324go: invalid option -- 's'",
+    "run35324go: invalid option -- 'e'",
+]
+abbr = 1
+
+[run35324go.optdict]
+-verbose = 0
+-version = 0
+
+[run35325go]
+bundling = 2
+query = [
+    "--outfile=../hello.world",
+]
+solution = [
+    "--=../hello.world",
+]
+prog = "run35325go"
+expectsposix = false
+reconcilesorders = false
+allowsshort = true
+allowslong = true
+special = 2
+warnings = []
+abbr = 1
+
+[run35325go.optdict]
+--outfile = 2
+
+
+[run35326go]
+bundling = 2
+query = [
+    "--outfile=../hello.world",
+]
+solution = [
+    "--o=../hello.world",
+]
+prog = "run35326go"
+expectsposix = false
+reconcilesorders = false
+allowsshort = true
+allowslong = true
+special = 2
+warnings = []
+abbr = 1
+
+[run35326go.optdict]
+--infile = 2
+--outfile = 2
+
+
+[run35327go]
+bundling = 2
+query = [
+    "--outfile",
+]
+solution = [
+    "--o",
+]
+prog = "run35327go"
+expectsposix = false
+reconcilesorders = false
+allowsshort = true
+allowslong = true
+special = 2
+warnings = []
+abbr = 1
+
+[run35327go.optdict]
+--outfile = 2

{preparse-2.0.0.dev10.dist-info → preparse-2.0.0.dev12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: preparse
-Version: 2.0.0.dev10
+Version: 2.0.0.dev12
 Summary: This project preparses args for further parsing later on.
 Author-email: Johannes <johannes.programming@gmail.com>
 License: The MIT License (MIT)

{preparse-2.0.0.dev10.dist-info → preparse-2.0.0.dev12.dist-info}/RECORD

@@ -9,7 +9,7 @@ preparse/_items/__init__.py,sha256=_rfDzOPgUqPZnROBEig35wIw2uAoVtjriFNmcQBuPnI,2
 preparse/_processing/__init__.py,sha256=OnT8Zp_n6QDxY6B_VAuSutTzDkVa41pHh36oZKRFvNo,1172
 preparse/_processing/deparsing.py,sha256=wPa1hKda3j8H2Y8K9e8kToekXx0dRcSbpYz23TL9Gdk,249
 preparse/_processing/digesting.py,sha256=rvPwfHXLkTzsCDofH6OlsGqOdy5YCxCuWUns8SPBenU,4450
-preparse/_processing/parsing.py,sha256=i6osYYqicdL4bWvDFz_aqiWod7VksylbbPbIg-BTLBM,5094
+preparse/_processing/parsing.py,sha256=Ct65zGRvws8YU52vWKiE3jPthBqhy89KsWSE5442ca8,5568
 preparse/_processing/pulling.py,sha256=4zJfOeBr4yLj9ClangXFqZPjXfcAjYn_VSMbLclaZik,350
 preparse/_utils/__init__.py,sha256=KNK6PuqZPkYXY85tM-AfUoS_lrRNAmfJF5Wvk7Wipco,39
 preparse/_utils/dataprop.py,sha256=YgSkJptMshxD5MDhXvDM1m7xHIeac_tt_SpcTZkfdlw,545
@@ -20,15 +20,15 @@ preparse/core/__init__.py,sha256=YIHjizpgeWuXE_AFPBVZGUXy5Tj_j5oW0EsZYLyNHxA,179
 preparse/core/enums.py,sha256=jdkIdfAj2syeSaW2hEnvIXsDmWYX2w6X1Lp8h1ahVME,580
 preparse/core/warnings.py,sha256=xqC-Y7HvWMpZ24K6MJZa8QpBgjt3JL948LQQrDF9m_Q,3793
 preparse/tests/__init__.py,sha256=xudYvSE5tnXSgesYCLp9CQbWeEhC51OeLpNlJ14uPfQ,374
-preparse/tests/data.toml,sha256=pCN4tssVKDx-pGdWsZD8EfjXn3AhIRdwCE5MMtcJLAo,16853517
+preparse/tests/data.toml,sha256=iBrlr8dbYfi7FwQ3KUepQPYE8ZJdzcnh2d4G07rOJ7E,16856356
 preparse/tests/expit.toml,sha256=fP0P99hkbRu2vsCKBFLLCscMPo_XFpMBaV-y0MnjVnw,1206
 preparse/tests/test_data_toml.py,sha256=z835Eq8tdiNxZPQBCJeqrN2PWsRQhXw4BNW_wYGgeGU,2560
 preparse/tests/test_enums.py,sha256=MZfmCE-2v_lP6GLqW_b_d5NkN3kUa1lNzQ6JPh26Hmo,383
 preparse/tests/test_expit_toml.py,sha256=R5vsGLRROZv6bzMbn7aSjTEeYfWG_k9FKONwn0v0FpU,2335
 preparse/tests/test_optdict.py,sha256=NuEJp83jsJCq5z0-k6UzT-v4XagT6IgDr45VJZGGKBk,504
 preparse/tests/test_preparser.py,sha256=imEv-Yfh7FI6H-zKo3hvyBJWvMUWUDxWCTvfHB4nnVI,1271
-preparse-2.0.0.dev10.dist-info/licenses/LICENSE.txt,sha256=QwqYepQwTN5xG57cngKt6xxYD9z9hw9d3lcI8zSLiNg,1074
-preparse-2.0.0.dev10.dist-info/METADATA,sha256=OZVrQXJVtBJt4WGwaJaNuh4yFA449UZ3HwD6ta3TaRQ,2603
-preparse-2.0.0.dev10.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-preparse-2.0.0.dev10.dist-info/top_level.txt,sha256=YFPuigMoI1m1K63OFDAQ6zN8yqCwAFwC7lNCTIOKj1I,9
-preparse-2.0.0.dev10.dist-info/RECORD,,
+preparse-2.0.0.dev12.dist-info/licenses/LICENSE.txt,sha256=QwqYepQwTN5xG57cngKt6xxYD9z9hw9d3lcI8zSLiNg,1074
+preparse-2.0.0.dev12.dist-info/METADATA,sha256=LcIYq_WR5QLmCJta6_A639_Dh0-KtJV4CBqlmFhjp3Y,2603
+preparse-2.0.0.dev12.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+preparse-2.0.0.dev12.dist-info/top_level.txt,sha256=YFPuigMoI1m1K63OFDAQ6zN8yqCwAFwC7lNCTIOKj1I,9
+preparse-2.0.0.dev12.dist-info/RECORD,,