omdev 0.0.46__tar.gz → 0.0.48__tar.gz

{omdev-0.0.46/omdev.egg-info → omdev-0.0.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.46
+Version: 0.0.48
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,11 +14,11 @@ Classifier: Programming Language :: Python :: 3.15
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.46
+Requires-Dist: omcore==0.0.48
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.46; extra == "ominfra"
+Requires-Dist: ominfra==0.0.48; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.46; extra == "omllm"
+Requires-Dist: omllm==0.0.48; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c
@@ -42,18 +42,32 @@ Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
 Provides-Extra: tui
 Requires-Dist: rich~=15.0; extra == "tui"
-Requires-Dist: textual~=8.2; extra == "tui"
-Requires-Dist: textual-dev~=1.8; extra == "tui"
-Requires-Dist: textual-speedups~=0.2; extra == "tui"
+Provides-Extra: tui-syntax
+Requires-Dist: tree-sitter~=0.26; extra == "tui-syntax"
+Requires-Dist: tree-sitter-bash~=0.25; extra == "tui-syntax"
+Requires-Dist: tree-sitter-css~=0.25; extra == "tui-syntax"
+Requires-Dist: tree-sitter-go~=0.25; extra == "tui-syntax"
+Requires-Dist: tree-sitter-html~=0.23; extra == "tui-syntax"
+Requires-Dist: tree-sitter-java~=0.23; extra == "tui-syntax"
+Requires-Dist: tree-sitter-javascript~=0.25; extra == "tui-syntax"
+Requires-Dist: tree-sitter-json~=0.24; extra == "tui-syntax"
+Requires-Dist: tree-sitter-markdown~=0.5; extra == "tui-syntax"
+Requires-Dist: tree-sitter-python~=0.25; extra == "tui-syntax"
+Requires-Dist: tree-sitter-regex~=0.25; extra == "tui-syntax"
+Requires-Dist: tree-sitter-rust~=0.24; extra == "tui-syntax"
+Requires-Dist: tree-sitter-sql~=0.3; extra == "tui-syntax"
+Requires-Dist: tree-sitter-toml~=0.7; extra == "tui-syntax"
+Requires-Dist: tree-sitter-xml~=0.7; extra == "tui-syntax"
+Requires-Dist: tree-sitter-yaml~=0.7; extra == "tui-syntax"
 Provides-Extra: cext
-Requires-Dist: omdev-cext==0.0.46; extra == "cext"
+Requires-Dist: omdev-cext==0.0.48; extra == "cext"
 Provides-Extra: rs
-Requires-Dist: omdev-rs==0.0.46; extra == "rs"
+Requires-Dist: omdev-rs==0.0.48; extra == "rs"
 Provides-Extra: cli
-Requires-Dist: omdev-cli==0.0.46; extra == "cli"
+Requires-Dist: omdev-cli==0.0.48; extra == "cli"
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.46; extra == "all"
-Requires-Dist: omllm==0.0.46; extra == "all"
+Requires-Dist: ominfra==0.0.48; extra == "all"
+Requires-Dist: omllm==0.0.48; extra == "all"
 Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -68,12 +82,25 @@ Requires-Dist: pillow~=12.3; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
 Requires-Dist: rich~=15.0; extra == "all"
-Requires-Dist: textual~=8.2; extra == "all"
-Requires-Dist: textual-dev~=1.8; extra == "all"
-Requires-Dist: textual-speedups~=0.2; extra == "all"
-Requires-Dist: omdev-cext==0.0.46; extra == "all"
-Requires-Dist: omdev-rs==0.0.46; extra == "all"
-Requires-Dist: omdev-cli==0.0.46; extra == "all"
+Requires-Dist: tree-sitter~=0.26; extra == "all"
+Requires-Dist: tree-sitter-bash~=0.25; extra == "all"
+Requires-Dist: tree-sitter-css~=0.25; extra == "all"
+Requires-Dist: tree-sitter-go~=0.25; extra == "all"
+Requires-Dist: tree-sitter-html~=0.23; extra == "all"
+Requires-Dist: tree-sitter-java~=0.23; extra == "all"
+Requires-Dist: tree-sitter-javascript~=0.25; extra == "all"
+Requires-Dist: tree-sitter-json~=0.24; extra == "all"
+Requires-Dist: tree-sitter-markdown~=0.5; extra == "all"
+Requires-Dist: tree-sitter-python~=0.25; extra == "all"
+Requires-Dist: tree-sitter-regex~=0.25; extra == "all"
+Requires-Dist: tree-sitter-rust~=0.24; extra == "all"
+Requires-Dist: tree-sitter-sql~=0.3; extra == "all"
+Requires-Dist: tree-sitter-toml~=0.7; extra == "all"
+Requires-Dist: tree-sitter-xml~=0.7; extra == "all"
+Requires-Dist: tree-sitter-yaml~=0.7; extra == "all"
+Requires-Dist: omdev-cext==0.0.48; extra == "all"
+Requires-Dist: omdev-rs==0.0.48; extra == "all"
+Requires-Dist: omdev-cli==0.0.48; extra == "all"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.46 → omdev-0.0.48}/omdev/.om-manifests.json

@@ -343,7 +343,7 @@
     "module": ".tools.cloc",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/cloc.py",
-    "line": 248,
+    "line": 260,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cloc",
@@ -577,7 +577,7 @@
     "module": ".tools.sqlrepl",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/sqlrepl.py",
-    "line": 307,
+    "line": 306,
     "value": {
       "!.cli.types.CliModule": {
         "name": "sqlrepl",
@@ -585,21 +585,6 @@
       }
     }
   },
-  {
-    "module": ".tui.apps.markdown.__main__",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/tui/apps/markdown/__main__.py",
-    "line": 4,
-    "value": {
-      "!.cli.types.CliModule": {
-        "name": [
-          "tui/markdown",
-          "tui/md"
-        ],
-        "module": "omdev.tui.apps.markdown.__main__"
-      }
-    }
-  },
   {
     "module": ".tui.rich.diff.__main__",
     "attr": "_CLI_MODULE",

{omdev-0.0.46 → omdev-0.0.48}/omdev/__about__.py

@@ -64,9 +64,25 @@ class Project(ProjectBase):
 
         'tui': [
             'rich ~= 15.0',
-            'textual ~= 8.2',  # [syntax]
-            'textual-dev ~= 1.8',
-            'textual-speedups ~= 0.2',
+        ],
+
+        'tui-syntax': [
+            'tree-sitter ~= 0.26',
+            'tree-sitter-bash ~= 0.25',
+            'tree-sitter-css ~= 0.25',
+            'tree-sitter-go ~= 0.25',
+            'tree-sitter-html ~= 0.23',
+            'tree-sitter-java ~= 0.23',
+            'tree-sitter-javascript ~= 0.25',
+            'tree-sitter-json ~= 0.24',
+            'tree-sitter-markdown ~= 0.5',
+            'tree-sitter-python ~= 0.25',
+            'tree-sitter-regex ~= 0.25',
+            'tree-sitter-rust ~= 0.24',
+            'tree-sitter-sql ~= 0.3',
+            'tree-sitter-toml ~= 0.7',
+            'tree-sitter-xml ~= 0.7',
+            'tree-sitter-yaml ~= 0.7',
         ],
     }
 

{omdev-0.0.46 → omdev-0.0.48}/omdev/amalg/cli/main.py

@@ -29,6 +29,7 @@ Targets:
 import argparse
 import os.path
 import stat
+import tempfile
 import typing as ta
 
 from omcore import check
@@ -59,18 +60,35 @@ def _gen_one(
     ).gen_amalg()
 
     if output_path is not None:
-        os.makedirs(os.path.dirname(output_path), exist_ok=True)
-        with open(output_path, 'w') as f:
-            f.write(src)
-
-        src_mode = os.stat(input_path).st_mode
-        out_mode = (
-            src_mode
-            | (stat.S_IXUSR if src_mode & stat.S_IRUSR else 0)
-            | (stat.S_IXGRP if src_mode & stat.S_IRGRP else 0)
-            | (stat.S_IXOTH if src_mode & stat.S_IROTH else 0)
+        od = os.path.dirname(output_path)
+        os.makedirs(od, exist_ok=True)
+
+        on = os.path.basename(output_path)
+        fd, fp = tempfile.mkstemp(
+            prefix=('.' if not on.startswith('.') else '') + on,
+            suffix='.tmp',
+            dir=od,
         )
-        os.chmod(output_path, out_mode)
+        try:
+            os.write(fd, src.encode('utf-8'))
+
+            src_mode = os.stat(input_path).st_mode
+            out_mode = (
+                src_mode |
+                (stat.S_IXUSR if src_mode & stat.S_IRUSR else 0) |
+                (stat.S_IXGRP if src_mode & stat.S_IRGRP else 0) |
+                (stat.S_IXOTH if src_mode & stat.S_IROTH else 0)
+            )
+            os.chmod(fp, out_mode)
+
+            os.replace(fp, output_path)
+
+        except BaseException:
+            os.unlink(fp)
+            raise
+
+        finally:
+            os.close(fd)
 
     else:
         print(src)

{omdev-0.0.46 → omdev-0.0.48}/omdev/dockerdev/resources/.python-versions.json

@@ -1,9 +1,9 @@
 {
   "8": "3.8.20",
   "9": "3.9.25",
-  "10": "3.10.20",
-  "11": "3.11.15",
-  "12": "3.12.13",
+  "10": "3.10.21",
+  "11": "3.11.16",
+  "12": "3.12.14",
   "13": "3.13.15",
   "13d": "3.13.15d",
   "13t": "3.13.15t",

{omdev-0.0.46 → omdev-0.0.48}/omdev/dockerdev/resources/depsets/system.toml

@@ -85,6 +85,8 @@ deps = [
   'libgdbm6',
   'libpq-dev',
   'libsqlite3-dev',
+  'mysql-server',
+  'postgresql',
   'postgresql-client',
   'redis',
   'sqlite3',

omdev-0.0.48/omdev/dockerdev/resources/fragments/om.sh

@@ -0,0 +1,8 @@
+curl -LsSf 'https://raw.githubusercontent.com/wrmsr/om/master/omdev/cli/install.py' | bash --login -c 'python3 - $@' - \
+  'omcore[cext,mypyc,plus]' \
+  'omdev[cext]' \
+  'ominfra' \
+  'omllm' \
+  \
+  'pip' \
+;

omdev-0.0.48/omdev/dockerdev/resources/scripts/run-mysql

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -ex
+
+if ! sudo test -d /var/lib/mysql/mysql; then
+    sudo mysqld --initialize-insecure --user=mysql
+fi
+
+sudo install -d -o mysql -g mysql -m 0755 /var/run/mysqld
+
+sudo tee /var/run/mysqld/init.sql > /dev/null <<'SQL'
+ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY 'om';
+CREATE USER IF NOT EXISTS 'root'@'%' IDENTIFIED BY 'om';
+ALTER USER 'root'@'%' IDENTIFIED WITH caching_sha2_password BY 'om';
+GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION;
+CREATE USER IF NOT EXISTS 'om'@'%' IDENTIFIED BY 'om';
+ALTER USER 'om'@'%' IDENTIFIED WITH caching_sha2_password BY 'om';
+SQL
+
+# --skip-log-error overrides the packaged config's log_error file and sends the error log to stderr instead. dumb-init
+# rewrites SIGINT to SIGTERM, as mysqld ignores SIGINT but shuts down cleanly on SIGTERM.
+exec sudo dumb-init --rewrite 2:15 mysqld --user=mysql --init-file=/var/run/mysqld/init.sql --skip-log-error

omdev-0.0.48/omdev/dockerdev/resources/scripts/run-postgres

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -ex
+
+PG_VERSION=$(ls /usr/lib/postgresql | sort -n | tail -n 1)
+PG_BIN=/usr/lib/postgresql/$PG_VERSION/bin
+
+if ! pg_lsclusters -h | grep -q "^$PG_VERSION main "; then
+    sudo pg_createcluster "$PG_VERSION" main
+fi
+
+echo "ALTER USER postgres PASSWORD 'om';" | sudo runuser -u postgres -- "$PG_BIN/postgres" --single \
+    -D "/var/lib/postgresql/$PG_VERSION/main" \
+    -c "config_file=/etc/postgresql/$PG_VERSION/main/postgresql.conf" \
+    postgres
+
+exec sudo pg_ctlcluster "$PG_VERSION" main start --foreground

{omdev-0.0.46 → omdev-0.0.48}/omdev/home/secrets.py

@@ -1,19 +1,13 @@
 import os.path
 import typing as ta
 
-from omcore import lang
+from omcore.formats.yaml import all as yaml
 from omcore.os.environ import EnvVar
 from omcore.secrets import all as sec
 
 from .paths import get_home_paths
 
 
-if ta.TYPE_CHECKING:
-    import yaml
-else:
-    yaml = lang.proxy_import('yaml')
-
-
 ##
 
 
@@ -31,7 +25,7 @@ def load_secrets() -> sec.Secrets:
     dct: dict[str, sec.Secret] = {}
     try:
         with open(get_secrets_file()) as f:
-            for k, v in yaml.safe_load(f).items():
+            for k, v in yaml.loads(f.read()).items():
                 if isinstance(v, str):
                     dct[k] = sec.Secret(key=k, value=v)
     except FileNotFoundError:

{omdev-0.0.46 → omdev-0.0.48}/omdev/js/quickjs/_quickjs/libregexp.c

@@ -1025,7 +1025,7 @@ static int parse_class_string_disjunction(REParseState *s, REStringList *cr,
     for(;;) {
         str.size = 0;
         while (*p != '}' && *p != '|') {
-            c = get_class_atom(s, NULL, &p, false);
+            c = get_class_atom(s, NULL, &p, true);
             if (c < 0)
                 goto fail;
             if (dbuf_put_u32(&str, c)) {
@@ -1119,6 +1119,23 @@ static int get_class_atom(REParseState *s, REStringList *cr,
             if (!inclass && s->is_unicode)
                 goto invalid_escape;
             break;
+        case '&':
+        case '!':
+        case '#':
+        case '%':
+        case ',':
+        case ':':
+        case ';':
+        case '<':
+        case '=':
+        case '>':
+        case '@':
+        case '`':
+        case '~':
+            if (s->is_unicode && (!inclass || !s->unicode_sets))
+                /* Only illegal if in unicode mode and not in a class */
+                goto invalid_escape;
+            break;
         case '^':
         case '$':
         case '\\':

{omdev-0.0.46 → omdev-0.0.48}/omdev/js/quickjs/_quickjs/quickjs-libc.c

@@ -1920,7 +1920,7 @@ static const JSCFunctionListEntry js_std_funcs[] = {
     JS_CFUNC_DEF("evalScript", 1, js_evalScript ),
     JS_CFUNC_DEF("loadScript", 1, js_loadScript ),
     JS_CFUNC_DEF("getenv", 1, js_std_getenv ),
-    JS_CFUNC_DEF("setenv", 1, js_std_setenv ),
+    JS_CFUNC_DEF("setenv", 2, js_std_setenv ),
     JS_CFUNC_DEF("unsetenv", 1, js_std_unsetenv ),
     JS_CFUNC_DEF("getenviron", 1, js_std_getenviron ),
 #if !defined(__wasi__)
@@ -4449,7 +4449,7 @@ static const JSCFunctionListEntry js_os_funcs[] = {
     JS_CFUNC_DEF("sleepAsync", 1, js_os_sleepAsync ),
     JS_PROP_STRING_DEF("platform", OS_PLATFORM, 0 ),
     JS_CFUNC_DEF("getcwd", 0, js_os_getcwd ),
-    JS_CFUNC_DEF("chdir", 0, js_os_chdir ),
+    JS_CFUNC_DEF("chdir", 1, js_os_chdir ),
     JS_CFUNC_DEF("mkdir", 1, js_os_mkdir ),
     JS_CFUNC_DEF("readdir", 1, js_os_readdir ),
 #if !defined(_WIN32) && !defined(__wasi__)