wyvrnpm 2.0.4 → 2.3.2

package/bin/wyvrn.js

@@ -3,15 +3,19 @@
 'use strict';
 
 const yargs     = require('yargs');
-const init      = require('../src/commands/init');
-const install   = require('../src/commands/install');
-const clean     = require('../src/commands/clean');
-const publish   = require('../src/commands/publish');
-const configure = require('../src/commands/configure');
-const profile   = require('../src/commands/profile');
+const init         = require('../src/commands/init');
+const install      = require('../src/commands/install');
+const clean        = require('../src/commands/clean');
+const publish      = require('../src/commands/publish');
+const configure    = require('../src/commands/configure');
+const profile      = require('../src/commands/profile');
+const build        = require('../src/commands/build');
+const show         = require('../src/commands/show');
+const installSkill = require('../src/commands/install-skill');
 const { link, unlink } = require('../src/commands/link');
 
 yargs
+  .parserConfiguration({ 'populate--': true })
   .option('manifest', {
     type: 'string',
     description: 'Path to manifest file',
@@ -48,6 +52,44 @@ yargs
           type: 'string',
           description: 'Build profile name to use (default: config.defaultProfile → "default")',
         })
+        .option('build', {
+          type: 'string',
+          choices: ['never', 'missing', 'always'],
+          default: 'never',
+          description:
+            'Resolution mode when no exact profile match exists. ' +
+            'never=fail; missing=build from source (pending phase 3); always=rebuild (pending phase 3)',
+        })
+        .option('option', {
+          alias: 'o',
+          type: 'string',
+          array: true,
+          description:
+            'Override a package option. Repeatable. Format: <pkg>:<name>=<value>. ' +
+            'Example: -o zlib:minizip=false -o OpenSSL:fips=true',
+        })
+        .option('upload-built', {
+          type: 'boolean',
+          default: false,
+          description:
+            'After successful --build=missing, upload each source-built artefact ' +
+            'back to the registry under the active profileHash so the next consumer ' +
+            'gets a direct download. Requires write credentials for the upload source.',
+        })
+        .option('upload-source', {
+          type: 'string',
+          description:
+            'Destination for --upload-built (URL or configured publish-source name). ' +
+            'Defaults to the first configured publish source.',
+        })
+        .option('aws-profile', {
+          type: 'string',
+          description: 'AWS SSO profile for --upload-built when uploading to S3',
+        })
+        .option('token', {
+          type: 'string',
+          description: 'Bearer token for --upload-built when uploading to HTTP',
+        })
         .option('platform', {
           type: 'string',
           description: 'v1 legacy platform path (used as fallback if v2 not found)',
@@ -58,17 +100,158 @@ yargs
           type: 'number',
           description: 'HTTP timeout in seconds',
           default: 300,
+        })
+        .option('format', {
+          type: 'string',
+          choices: ['text', 'json'],
+          default: 'text',
+          description: 'Output format. "json" emits a single JSON object on stdout; log lines go to stderr.',
         });
     },
-    (argv) => install(argv),
+    (argv) => install({
+      ...argv,
+      uploadBuilt:  argv['upload-built'],
+      uploadSource: argv['upload-source'],
+      awsProfile:   argv['aws-profile'],
+    }),
+  )
+
+  // ── build ─────────────────────────────────────────────────────────────────
+  .command(
+    'build',
+    'Configure and build the project via the wyvrnpm-generated CMake preset. ' +
+    'Auto-runs `install` if the toolchain is missing or stale.',
+    (y) => {
+      y
+        .option('preset', {
+          alias: 'P',
+          type: 'string',
+          description: 'CMake configure preset name (default: wyvrn-<profile>)',
+        })
+        .option('profile', {
+          alias: 'p',
+          type: 'string',
+          description: 'Build profile name — determines the default preset',
+        })
+        .option('config', {
+          alias: 'c',
+          type: 'string',
+          choices: ['Debug', 'Release', 'RelWithDebInfo', 'MinSizeRel'],
+          default: 'Release',
+          description: 'Build configuration',
+        })
+        .option('target', {
+          alias: 't',
+          type: 'string',
+          description: 'CMake target to build (default: all)',
+        })
+        .option('verbose', {
+          alias: 'v',
+          type: 'boolean',
+          default: false,
+          description: 'Pass --verbose to cmake --build (detailed compiler output)',
+        })
+        .option('clean', {
+          type: 'boolean',
+          default: false,
+          description: 'Remove the build directory before configuring',
+        })
+        .option('install', {
+          type: 'boolean',
+          default: false,
+          description: 'Run `cmake --install` after the build (installs to the prefix baked at configure time, or --install-prefix)',
+        })
+        .option('install-prefix', {
+          type: 'string',
+          description: 'Override CMAKE_INSTALL_PREFIX for `--install` without reconfiguring',
+        })
+        .option('auto-install', {
+          type: 'boolean',
+          default: true,
+          description: 'Auto-run `wyvrnpm install` when the toolchain is stale. Disable with --no-auto-install.',
+        })
+        .option('source', {
+          alias: 's',
+          type: 'string',
+          array: true,
+          description: 'Package source(s) — passed through to `install` when auto-installing',
+        })
+        .option('platform', {
+          type: 'string',
+          choices: ['win_x64', 'win_x86', 'linux_x64', 'linux_x86', 'osx_x64', 'osx_arm64'],
+          default: 'win_x64',
+        })
+        .option('timeout', {
+          type: 'number',
+          default: 300,
+        });
+    },
+    (argv) => build({
+      ...argv,
+      autoInstall:   argv['auto-install'],
+      installPrefix: argv['install-prefix'],
+    }),
   )
 
   // ── clean ─────────────────────────────────────────────────────────────────
   .command(
     'clean',
-    'Remove downloaded packages and lock file',
-    () => {},
-    (argv) => clean(argv),
+    'Remove downloaded packages and lock file. --build-cache also wipes the machine-wide source-build cache.',
+    (y) => {
+      y
+        .option('build-cache', {
+          type: 'boolean',
+          default: false,
+          description: 'Also remove the source-build cache under %LOCALAPPDATA%\\wyvrnpm\\bc\\',
+        })
+        .option('uploaded-built', {
+          type: 'boolean',
+          default: false,
+          description:
+            'Wipe only the local record of artefacts uploaded via --upload-built ' +
+            '(the .uploaded-to.json sidecars in the build cache). Does not touch ' +
+            'the registry, the artefact zips, or wyvrn_internal/.',
+        });
+    },
+    (argv) => clean({
+      ...argv,
+      buildCache:     argv['build-cache'],
+      uploadedBuilt:  argv['uploaded-built'],
+    }),
+  )
+
+  // ── show ──────────────────────────────────────────────────────────────────
+  .command(
+    'show <pkg>',
+    'Display registry metadata for a package. Surfaces `uploadedBy` so consumer uploads can be told apart from author publishes.',
+    (y) => {
+      y
+        .positional('pkg', {
+          type: 'string',
+          description: 'Spec: <name>[@<version>[@<profileHash>]]',
+        })
+        .option('source', {
+          alias: 's',
+          type: 'string',
+          array: true,
+          description: 'Source URL(s) to query; defaults to configured install sources',
+        })
+        .option('aws-profile', {
+          type: 'string',
+          description: 'AWS SSO profile for S3 sources',
+        })
+        .option('token', {
+          type: 'string',
+          description: 'Bearer token for HTTP sources',
+        })
+        .option('format', {
+          type: 'string',
+          choices: ['text', 'json'],
+          default: 'text',
+          description: 'Output format. "json" emits a single JSON object on stdout; log lines go to stderr.',
+        });
+    },
+    (argv) => show({ ...argv, awsProfile: argv['aws-profile'] }),
   )
 
   // ── publish ───────────────────────────────────────────────────────────────
@@ -107,6 +290,20 @@ yargs
           description: 'Overwrite an existing published version',
           default: false,
         })
+        .option('option', {
+          alias: 'o',
+          type: 'string',
+          array: true,
+          description:
+            'Override an option value at publish time. Repeatable. ' +
+            'Format: <pkg>:<name>=<value> (pkg must match the package being published).',
+        })
+        .option('format', {
+          type: 'string',
+          choices: ['text', 'json'],
+          default: 'text',
+          description: 'Output format. "json" emits a single JSON object on stdout; log lines go to stderr.',
+        })
         ;
     },
     (argv) => publish({ ...argv, awsProfile: argv['aws-profile'] }),
@@ -272,6 +469,19 @@ yargs
     (argv) => unlink(argv),
   )
 
+  // ── install-skill ─────────────────────────────────────────────────────────
+  .command(
+    'install-skill',
+    'Install the bundled wyvrnpm Agent Skill into Claude Code (~/.claude/skills/wyvrnpm/)',
+    (y) => {
+      y
+        .option('claude',  { type: 'boolean', description: 'Install for Claude Code',            default: false })
+        .option('force',   { type: 'boolean', description: 'Overwrite an existing installation', default: false })
+        .option('dry-run', { type: 'boolean', description: 'Report actions without writing',     default: false });
+    },
+    (argv) => installSkill(argv),
+  )
+
   .demandCommand(1)
   .strict()
   .help()

package/cmake/cpp.cmake

@@ -0,0 +1,9 @@
+# Define the cpp information ( version, compilation type, thread type, exception handling )
+# Set a C++20 default only if the consumer (or wyvrnpm's toolchain) has not
+# already chosen a standard — the toolchain sets CMAKE_CXX_STANDARD from the
+# active build profile before project(), and that explicit choice must win.
+if(NOT DEFINED CMAKE_CXX_STANDARD)
+    set(CMAKE_CXX_STANDARD 20)
+    set(CMAKE_CXX_STANDARD_REQUIRED True)
+endif()
+set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API OFF)

package/cmake/functions.cmake

@@ -0,0 +1,224 @@
+# ── Internal helper ───────────────────────────────────────────────────────────
+# Collects all sources for the calling directory in three layers:
+#
+#   1. General sources  — all .cpp/.h/.hpp under CMAKE_CURRENT_SOURCE_DIR,
+#                         excluding HAL/, Platform/, and include/HAL|Platform/
+#   2. HAL common       — files sitting directly (non-recursive) in any HAL/ or
+#                         Platform/ root; these are platform-neutral shared headers
+#   3. HAL layered      — recursive sources from each applicable subdirectory,
+#                         resolved in order: family → leaf
+#
+#                         Family tiers (from variables.cmake derived vars):
+#                           microsoft  — Windows + Xbox
+#                           unix       — Linux + SteamOS + Android + Darwin + PlayStation
+#                           darwin     — macOS + iOS
+#                           playstation— PS4 + PS5
+#
+#                         Leaf dirs:
+#                           win  xbox  linux  steamos  mac  ios
+#                           android  ps4  ps5
+#
+#                         Search roots for both family and leaf dirs:
+#                           HAL/  Platform/  src/HAL/  src/Platform/
+#                           include/HAL/  include/Platform/
+#
+# Result is written to the variable named by <out_var> in the caller's scope.
+# Any additional arguments are treated as regex patterns to exclude from all source lists.
+function(_wyvrn_collect_sources out_var)
+    set(_extra_excludes ${ARGN})
+    file(GLOB_RECURSE _sources
+        "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+        "${CMAKE_CURRENT_SOURCE_DIR}/*.h"
+        "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp"
+    )
+    list(FILTER _sources EXCLUDE REGEX ".*[/\\\\]HAL[/\\\\].*")
+    list(FILTER _sources EXCLUDE REGEX ".*[/\\\\]Platform[/\\\\].*")
+    list(FILTER _sources EXCLUDE REGEX ".*[/\\\\]tests[/\\\\].*")
+    list(FILTER _sources EXCLUDE REGEX ".*[/\\\\]vendors[/\\\\].*")
+    list(FILTER _sources EXCLUDE REGEX ".*[/\\\\]wyvrn_internal[/\\\\].*")
+    list(FILTER _sources EXCLUDE REGEX ".*[/\\\\]build[/\\\\].*")
+    list(FILTER _sources EXCLUDE REGEX ".*[/\\\\]output[/\\\\].*")
+    
+    # Shared / platform-neutral files sitting directly in any HAL/ or Platform/ root
+    file(GLOB _hal_common
+        "${CMAKE_CURRENT_SOURCE_DIR}/HAL/*.*"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Platform/*.*"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/HAL/*.*"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/Platform/*.*"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/HAL/*.*"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/Platform/*.*"
+    )
+
+    # Build an ordered list of HAL subdirectory names to search: family first, then leaf.
+    # Each entry is searched under every search root listed in _hal_roots below.
+    set(_plat_dirs)
+
+    # ── Family tiers ──────────────────────────────────────────────────────────
+    if(WYVRN_PLATFORM_MICROSOFT)
+        list(APPEND _plat_dirs microsoft)
+    endif()
+    if(WYVRN_PLATFORM_UNIX)
+        list(APPEND _plat_dirs unix)
+    endif()
+    if(WYVRN_PLATFORM_DARWIN)
+        list(APPEND _plat_dirs darwin)
+    endif()
+    if(WYVRN_PLATFORM_PLAYSTATION)
+        list(APPEND _plat_dirs playstation)
+    endif()
+
+    # ── Leaf tiers ────────────────────────────────────────────────────────────
+    # Exactly one leaf is set by variables.cmake; SteamOS also gets a linux pass
+    # first (most SteamOS-targeting code lives there) then a steamos overlay pass.
+    if(WYVRN_PLATFORM_WINDOWS)
+        list(APPEND _plat_dirs win)
+    elseif(WYVRN_PLATFORM_XBOX)
+        list(APPEND _plat_dirs xbox)
+    elseif(WYVRN_PLATFORM_PS5)
+        list(APPEND _plat_dirs ps5)
+    elseif(WYVRN_PLATFORM_PS4)
+        list(APPEND _plat_dirs ps4)
+    elseif(WYVRN_PLATFORM_ANDROID)
+        list(APPEND _plat_dirs android)
+    elseif(WYVRN_PLATFORM_IOS)
+        list(APPEND _plat_dirs ios)
+    elseif(WYVRN_PLATFORM_MACOS)
+        list(APPEND _plat_dirs mac)
+    elseif(WYVRN_PLATFORM_STEAMOS)
+        list(APPEND _plat_dirs linux steamos)
+    elseif(WYVRN_PLATFORM_LINUX)
+        list(APPEND _plat_dirs linux)
+    endif()
+
+    # All directory roots that may contain HAL/<subdir>/ trees
+    set(_hal_roots
+        "${CMAKE_CURRENT_SOURCE_DIR}/HAL"
+        "${CMAKE_CURRENT_SOURCE_DIR}/Platform"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/HAL"
+        "${CMAKE_CURRENT_SOURCE_DIR}/src/Platform"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/HAL"
+        "${CMAKE_CURRENT_SOURCE_DIR}/include/Platform"
+    )
+
+    set(_hal_plat)
+    foreach(_dir IN LISTS _plat_dirs)
+        foreach(_root IN LISTS _hal_roots)
+            file(GLOB_RECURSE _tmp "${_root}/${_dir}/*.*")
+            list(APPEND _hal_plat ${_tmp})
+        endforeach()
+    endforeach()
+
+    foreach(_pat IN LISTS _extra_excludes)
+        list(FILTER _sources    EXCLUDE REGEX "${_pat}")
+        list(FILTER _hal_common EXCLUDE REGEX "${_pat}")
+        list(FILTER _hal_plat   EXCLUDE REGEX "${_pat}")
+    endforeach()
+
+    set(${out_var} ${_sources} ${_hal_common} ${_hal_plat} PARENT_SCOPE)
+endfunction()
+
+# ── Internal helper ───────────────────────────────────────────────────────────
+# Applies the standard Wyvrn compiler flags to <target>.
+function(_wyvrn_apply_compiler_flags target)
+    get_target_property(_wyvrn_target_type ${target} TYPE)
+    if(_wyvrn_target_type STREQUAL "INTERFACE_LIBRARY")
+        return()
+    endif()
+    target_compile_options(${target} PRIVATE ${WYVRN_COMPILER_FLAGS})
+    target_compile_options(${target} PRIVATE $<$<CONFIG:Debug>:${WYVRN_COMPILER_FLAGS_DEBUG}>)
+    target_compile_options(${target} PRIVATE $<$<CONFIG:Release>:${WYVRN_COMPILER_FLAGS_RELEASE}>)
+endfunction()
+
+# ── SETUP_LIBRARY(target type [EXCLUDE pat...] [extra_sources...]) ────────────
+# Creates a library target from all sources in CMAKE_CURRENT_SOURCE_DIR,
+# with platform-specific HAL sources included automatically.
+#
+# Arguments:
+#   target         CMake target name
+#   type           Library type: STATIC | SHARED | INTERFACE | OBJECT
+#   EXCLUDE        (optional) One or more regex patterns; matched files are
+#                  excluded from the auto-collected source list
+#   extra_sources  (optional) Additional source files to append (positional,
+#                  or via the SOURCES keyword)
+#
+# Side effects:
+#   - Registers aliases  chroma::<target>  and  wyvrn::<target>
+#   - Applies standard Wyvrn compiler flags
+#   - Configures source_group for IDE folder view
+#
+# Example:
+#   SETUP_LIBRARY(WyvrnLog STATIC)
+#   SETUP_LIBRARY(WyvrnRenderer SHARED ${PLATFORM_GENERATED_SOURCES})
+#   SETUP_LIBRARY(WyvrnCore STATIC EXCLUDE ".*legacy.*" ".*_old\\.cpp")
+function(SETUP_LIBRARY target type)
+    cmake_parse_arguments(_SETUP "" "" "EXCLUDE;SOURCES" ${ARGN})
+    _wyvrn_collect_sources(_sources ${_SETUP_EXCLUDE})
+    list(APPEND _sources ${_SETUP_SOURCES} ${_SETUP_UNPARSED_ARGUMENTS})
+
+    add_library(${target} ${type} ${_sources})
+    _wyvrn_apply_compiler_flags(${target})
+    set(_src_sources "")
+    set(_gen_sources "")
+    foreach(_f IN LISTS _sources)
+        cmake_path(IS_PREFIX CMAKE_CURRENT_SOURCE_DIR "${_f}" NORMALIZE _is_under_src)
+        if(_is_under_src)
+            list(APPEND _src_sources "${_f}")
+        else()
+            list(APPEND _gen_sources "${_f}")
+        endif()
+    endforeach()
+    if(_src_sources)
+        source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${_src_sources})
+    endif()
+    if(_gen_sources)
+        source_group("Generated" FILES ${_gen_sources})
+    endif()
+
+    # chroma is a legacy alias namespace; new code should use wyvrn::, but both are provided for compatibility
+    add_library(chroma::${target} ALIAS ${target})
+    add_library(wyvrn::${target}  ALIAS ${target})
+
+    get_target_property(_wyvrn_target_type ${target} TYPE)
+    if(_wyvrn_target_type STREQUAL "INTERFACE_LIBRARY")
+        return()
+    endif()
+
+    target_include_directories(${target} 
+        PUBLIC 
+            $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/${target}>
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+    )
+
+endfunction()
+
+# ── SETUP_EXE(target [EXCLUDE pat...] [extra_sources...]) ─────────────────────
+# Creates an executable target from all sources in CMAKE_CURRENT_SOURCE_DIR,
+# with platform-specific HAL sources included automatically.
+# On Windows and Xbox the WIN32 subsystem flag is set automatically.
+#
+# Arguments:
+#   target         CMake target name
+#   EXCLUDE        (optional) One or more regex patterns; matched files are
+#                  excluded from the auto-collected source list
+#   extra_sources  (optional) Additional source files to append (positional,
+#                  or via the SOURCES keyword)
+#
+# Example:
+#   SETUP_EXE(ChromaApp)
+#   SETUP_EXE(ChromaTool ${TOOL_GENERATED_SOURCES})
+#   SETUP_EXE(ChromaTool EXCLUDE ".*test_stub.*" SOURCES ${EXTRA})
+function(SETUP_EXE target)
+    cmake_parse_arguments(_SETUP "" "" "EXCLUDE;SOURCES" ${ARGN})
+    _wyvrn_collect_sources(_sources ${_SETUP_EXCLUDE})
+    list(APPEND _sources ${_SETUP_SOURCES} ${_SETUP_UNPARSED_ARGUMENTS})
+
+    if(WYVRN_PLATFORM_WINDOWS OR WYVRN_PLATFORM_XBOX)
+        add_executable(${target} WIN32 ${_sources})
+    else()
+        add_executable(${target} ${_sources})
+    endif()
+
+    _wyvrn_apply_compiler_flags(${target})
+    source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${_sources})
+endfunction()