IncludeCPP 3.7.9__py3-none-any.whl → 3.8.0__py3-none-any.whl

includecpp/__init__.py

@@ -2,7 +2,7 @@ from .core.cpp_api import CppApi
 from .core import cssl_bridge as CSSL
 import warnings
 
-__version__ = "3.7.9"
+__version__ = "3.8.0"
 __all__ = ["CppApi", "CSSL"]
 
 # Module-level cache for C++ modules

includecpp/__init__.pyi

@@ -13,7 +13,7 @@ except ImportError:
     pass  # Generated during rebuild
 
 
-# ========== CSSL Module - CSO Service Script Language ==========
+# ========== CSSL Module ==========
 class _CSSLModule:
     """CSSL callable module created via CSSL.module()"""
     def __call__(self, *args: Any) -> Any:
@@ -139,7 +139,7 @@ class _CSSLBridge:
         ...
 
 
-# CSSL module instance - CSO Service Script Language
+# CSSL module instance
 CSSL: _CSSLBridge
 
 __version__: str

includecpp/cli/commands.py

@@ -7457,11 +7457,24 @@ def cssl():
     pass
 
 
+@cssl.command(name='run')
+@click.argument('path', required=False, type=click.Path())
+@click.option('--code', '-c', type=str, help='Execute code directly')
+def cssl_run(path, code):
+    """Run/execute CSSL code or file."""
+    _cssl_execute(path, code)
+
+
 @cssl.command(name='exec')
 @click.argument('path', required=False, type=click.Path())
 @click.option('--code', '-c', type=str, help='Execute code directly')
 def cssl_exec(path, code):
-    """Execute CSSL code or file."""
+    """Execute CSSL code or file (alias for 'run')."""
+    _cssl_execute(path, code)
+
+
+def _cssl_execute(path, code):
+    """Internal: Execute CSSL code or file."""
     from pathlib import Path as PathLib
 
     try:
@@ -7720,7 +7733,13 @@ def cssl_doc(search, list_sections):
                     click.echo("Or use: includecpp cssl doc --list")
         else:
             # Full documentation mode
-            click.echo_via_pager(content)
+            # Replace Unicode characters that may not be supported on all terminals
+            safe_content = content.replace('✓', '[OK]').replace('✗', '[X]').replace('→', '->').replace('←', '<-').replace('•', '*').replace('─', '-').replace('│', '|').replace('└', '+').replace('├', '+').replace('▸', '>').replace('▾', 'v')
+            try:
+                click.echo_via_pager(safe_content)
+            except UnicodeEncodeError:
+                # Fallback: encode with errors='replace'
+                click.echo(safe_content.encode('ascii', errors='replace').decode('ascii'))
     else:
         click.secho("Documentation file not found.", fg='yellow')
         click.echo("Looking for: CSSL_DOCUMENTATION.md")
@@ -7858,26 +7877,46 @@ def cssl_vscode():
         click.secho("CSSL extension files not found in package.", fg='red')
         return
 
-    # Install extension
-    target_dir = vscode_ext_dir / 'includecpp.cssl-1.0.0'
+    # Get version from package.json
+    pkg_json = source_ext_dir / 'package.json'
+    current_version = "1.1.0"
+    if pkg_json.exists():
+        try:
+            pkg_data = json.loads(pkg_json.read_text(encoding='utf-8'))
+            current_version = pkg_data.get('version', '1.1.0')
+        except:
+            pass
+
+    target_dir = vscode_ext_dir / f'includecpp.cssl-{current_version}'
 
     try:
+        # Check for existing installations
+        existing_version = None
+        for existing in vscode_ext_dir.glob('includecpp.cssl-*'):
+            existing_version = existing.name.split('-')[-1]
+            if existing_version != current_version:
+                click.echo(f"Removing old version: {existing_version}")
+                shutil.rmtree(existing)
+
         if target_dir.exists():
             shutil.rmtree(target_dir)
 
         shutil.copytree(source_ext_dir, target_dir)
 
-        click.secho("CSSL VSCode extension installed!", fg='green', bold=True)
+        if existing_version and existing_version != current_version:
+            click.secho(f"CSSL extension updated: v{existing_version} -> v{current_version}", fg='green', bold=True)
+        else:
+            click.secho(f"CSSL VSCode extension installed! (v{current_version})", fg='green', bold=True)
         click.echo()
         click.echo(f"Installed to: {target_dir}")
         click.echo()
         click.echo("Features:")
         click.echo("  - Syntax highlighting for .cssl, .cssl-pl, .cssl-mod files")
-        click.echo("  - BruteInjection operators: <==, ==>, <<==, +<==, etc.")
-        click.echo("  - Type highlighting: int, string, stack<T>, datastruct<T>")
+        click.echo("  - OOP support: class, constructor, this->member")
+        click.echo("  - Injection operators: <== (brute), <<== (infuse)")
+        click.echo("  - Type highlighting: int, string, stack<T>, instance<>")
         click.echo("  - Global references: @Name, r@Name, s@Name")
         click.echo("  - Shared objects: $Name")
-        click.echo("  - Filter helpers: string::contains, json::key, etc.")
         click.echo()
         click.secho("Restart VSCode to activate the extension.", fg='yellow')
 
@@ -7897,39 +7936,34 @@ cli.add_command(cssl)
 
 @cli.command()
 @click.option('--force', '-f', is_flag=True, help='Force overwrite existing files')
+@click.option('--reinstall', '-r', is_flag=True, help='Reinstall extension (removes all versions first)')
 @click.option('--stubs-only', is_flag=True, help='Only update stubs, skip extension files')
-def vscode(force, stubs_only):
+def vscode(force, reinstall, stubs_only):
     """Initialize or update VSCode configuration for IncludeCPP/CSSL.
 
-    Sets up .vscode folder with:
-    - CSSL language support (syntax highlighting, snippets)
-    - Type stubs for builtins (.pyi files)
-    - Auto-generated stubs for your plugins and modules
+    Installs CSSL extension globally and sets up project stubs.
 
     \b
     Usage:
-      includecpp vscode           # Initialize .vscode
-      includecpp vscode --force   # Force overwrite existing
+      includecpp vscode             # Install/update extension + stubs
+      includecpp vscode --force     # Force reinstall extension
+      includecpp vscode --reinstall # Remove ALL versions & reinstall fresh
       includecpp vscode --stubs-only  # Only update stubs
 
     \b
-    What it creates:
-      .vscode/
-        settings.json         - VSCode settings for CSSL
-        cssl/                 - CSSL language extension
-        stubs/                - Type stubs for IDE support
-          cssl_builtins.pyi   - CSSL builtin functions
-          plugins/            - Stubs for your .cp plugins
-          modules/            - Stubs for your modules
+    What it does:
+      1. Installs CSSL extension globally (~/.vscode/extensions/)
+      2. Creates .vscode/settings.json with file associations
+      3. Creates .vscode/stubs/ with type hints for IDE support
     """
     from pathlib import Path as PathLib
+    import os
 
     cwd = PathLib.cwd()
     vscode_dir = cwd / '.vscode'
     stubs_dir = vscode_dir / 'stubs'
     plugins_stubs_dir = stubs_dir / 'plugins'
     modules_stubs_dir = stubs_dir / 'modules'
-    cssl_ext_dir = vscode_dir / 'cssl'
 
     # Create directories
     vscode_dir.mkdir(exist_ok=True)
@@ -7945,56 +7979,84 @@ def vscode(force, stubs_only):
     updated_count = 0
     created_count = 0
 
-    # 1. Copy CSSL extension files (unless stubs-only)
+    # 1. Install CSSL extension GLOBALLY (unless stubs-only)
     if not stubs_only:
-        click.secho("Setting up CSSL language support...", fg='yellow')
+        click.secho("Installing CSSL extension globally...", fg='yellow')
 
         # Find source extension directory
         source_ext_dir = PathLib(__file__).parent.parent / 'vscode' / 'cssl'
 
         if source_ext_dir.exists():
-            cssl_ext_dir.mkdir(exist_ok=True)
-
-            # Copy extension files
-            ext_files = [
-                'language-configuration.json',
-                'package.json',
-            ]
-
-            for fname in ext_files:
-                src = source_ext_dir / fname
-                dst = cssl_ext_dir / fname
-                if src.exists():
-                    if not dst.exists() or force:
-                        shutil.copy2(src, dst)
-                        created_count += 1
-                        click.echo(f"  Created: .vscode/cssl/{fname}")
-
-            # Copy syntaxes folder
-            syntaxes_src = source_ext_dir / 'syntaxes'
-            syntaxes_dst = cssl_ext_dir / 'syntaxes'
-            if syntaxes_src.exists():
-                syntaxes_dst.mkdir(exist_ok=True)
-                for f in syntaxes_src.glob('*.json'):
-                    dst = syntaxes_dst / f.name
-                    if not dst.exists() or force:
-                        shutil.copy2(f, dst)
-                        created_count += 1
-                        click.echo(f"  Created: .vscode/cssl/syntaxes/{f.name}")
-
-            # Copy snippets folder
-            snippets_src = source_ext_dir / 'snippets'
-            snippets_dst = cssl_ext_dir / 'snippets'
-            if snippets_src.exists():
-                snippets_dst.mkdir(exist_ok=True)
-                for f in snippets_src.glob('*.json'):
-                    dst = snippets_dst / f.name
-                    if not dst.exists() or force:
-                        shutil.copy2(f, dst)
-                        created_count += 1
-                        click.echo(f"  Created: .vscode/cssl/snippets/{f.name}")
+            # Get version from package.json
+            pkg_json = source_ext_dir / 'package.json'
+            current_version = "1.1.0"
+            if pkg_json.exists():
+                try:
+                    pkg_data = json.loads(pkg_json.read_text(encoding='utf-8'))
+                    current_version = pkg_data.get('version', '1.1.0')
+                except:
+                    pass
+
+            # Find global VSCode extensions directory
+            if os.name == 'nt':  # Windows
+                global_ext_dir = PathLib(os.environ.get('USERPROFILE', '')) / '.vscode' / 'extensions'
+            else:  # Linux/Mac
+                global_ext_dir = PathLib.home() / '.vscode' / 'extensions'
+
+            if not global_ext_dir.exists():
+                # Try VSCode Insiders
+                if os.name == 'nt':
+                    global_ext_dir = PathLib(os.environ.get('USERPROFILE', '')) / '.vscode-insiders' / 'extensions'
+                else:
+                    global_ext_dir = PathLib.home() / '.vscode-insiders' / 'extensions'
+
+            if global_ext_dir.exists():
+                target_dir = global_ext_dir / f'includecpp.cssl-{current_version}'
+
+                # Check if already installed with same or older version
+                needs_install = force or reinstall
+                existing_version = None
+
+                # Find existing installations
+                for existing in global_ext_dir.glob('includecpp.cssl-*'):
+                    existing_version = existing.name.split('-')[-1]
+                    if reinstall:
+                        # --reinstall: Remove ALL versions
+                        click.echo(f"  Removing version: {existing_version}")
+                        shutil.rmtree(existing)
+                        needs_install = True
+                    elif existing_version != current_version:
+                        # Remove old version
+                        click.echo(f"  Removing old version: {existing_version}")
+                        shutil.rmtree(existing)
+                        needs_install = True
+                    elif not force:
+                        click.echo(f"  Already installed: v{current_version}")
+                        needs_install = False
+
+                if not target_dir.exists():
+                    needs_install = True
+
+                if needs_install:
+                    # Remove target if exists (force reinstall)
+                    if target_dir.exists():
+                        shutil.rmtree(target_dir)
+
+                    # Copy extension to global directory
+                    shutil.copytree(source_ext_dir, target_dir)
+                    created_count += 1
+
+                    if existing_version and existing_version != current_version:
+                        click.secho(f"  Updated: v{existing_version} -> v{current_version}", fg='green')
+                    else:
+                        click.secho(f"  Installed: v{current_version}", fg='green')
 
-            click.secho("  CSSL extension configured", fg='green')
+                    click.echo(f"  Location: {target_dir}")
+                    click.echo()
+                    click.secho("  Restart VSCode to activate the extension!", fg='yellow', bold=True)
+            else:
+                click.secho("  VSCode extensions directory not found.", fg='red')
+                click.echo("  Make sure VSCode is installed.")
         else:
             click.secho("  Warning: CSSL extension source not found", fg='yellow')
 

includecpp/core/cssl/__init__.py

@@ -1,5 +1,5 @@
 """
-CSSL - CSO Service Script Language
+CSSL - C-Style Scripting Language
 Bundled with IncludeCPP for integrated scripting support.
 
 Features:
@@ -16,7 +16,10 @@ from .cssl_parser import (
     CSSLSyntaxError, CSSLLexer, CSSLParser, ASTNode,
     KEYWORDS, TYPE_GENERICS, TYPE_PARAM_FUNCTIONS, INJECTION_HELPERS
 )
-from .cssl_runtime import CSSLRuntime, CSSLRuntimeError, CSSLServiceRunner, run_cssl, run_cssl_file
+from .cssl_runtime import (
+    CSSLRuntime, CSSLRuntimeError, CSSLServiceRunner, run_cssl, run_cssl_file,
+    register_filter, unregister_filter, get_custom_filters
+)
 from .cssl_types import (
     DataStruct, Shuffled, Iterator, Combo, DataSpace, OpenQuote,
     OpenFind, Parameter, Stack, Vector, Array,
@@ -33,6 +36,8 @@ __all__ = [
     # Runtime
     'CSSLRuntime', 'CSSLRuntimeError', 'CSSLServiceRunner',
     'run_cssl', 'run_cssl_file',
+    # Filter Registration
+    'register_filter', 'unregister_filter', 'get_custom_filters',
     # Data Types
     'DataStruct', 'Shuffled', 'Iterator', 'Combo', 'DataSpace', 'OpenQuote',
     'OpenFind', 'Parameter', 'Stack', 'Vector', 'Array',