windowpp 0.1.2 → 0.1.4

package/bin/windowpp.js

@@ -51,7 +51,10 @@ switch (command) {
         }
         const flags = parseFlags(args.slice(2));
         const { create } = require('../lib/create');
-        create(name, { template: flags.template, outDir: flags.outDir });
+        create(name, { template: flags.template, outDir: flags.outDir }).catch((err) => {
+            console.error(err.message || err);
+            process.exit(1);
+        });
         break;
     }
 

package/lib/create.js

@@ -5,8 +5,45 @@
 
 const path = require('path');
 const fs = require('fs');
+const readline = require('readline');
 const { execSync } = require('child_process');
 
+// ─── Interactive template picker ─────────────────────────────────────────────
+function listTemplates(cliDir) {
+    const templatesDir = path.join(cliDir, 'templates');
+    if (!fs.existsSync(templatesDir)) return [];
+    return fs.readdirSync(templatesDir, { withFileTypes: true })
+        .filter(d => d.isDirectory())
+        .map(d => d.name)
+        .sort();
+}
+
+function promptTemplate(templates) {
+    return new Promise((resolve) => {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+
+        console.log('\nAvailable templates:');
+        templates.forEach((t, i) => console.log(`  [${i + 1}] ${t}`));
+        console.log();
+
+        const ask = () => {
+            rl.question(`Pick a template [1-${templates.length}] (default: 1): `, (answer) => {
+                const trimmed = answer.trim();
+                if (trimmed === '') { rl.close(); resolve(templates[0]); return; }
+                const idx = parseInt(trimmed, 10) - 1;
+                if (idx >= 0 && idx < templates.length) {
+                    rl.close();
+                    resolve(templates[idx]);
+                } else {
+                    console.log(`  Please enter a number between 1 and ${templates.length}.`);
+                    ask();
+                }
+            });
+        };
+        ask();
+    });
+}
+
 const TEXT_EXTENSIONS = new Set([
     '.cpp', '.h', '.ts', '.tsx', '.js', '.json', '.html',
     '.css', '.md', '.txt', '.cmake', '.sh', '.env',
@@ -38,9 +75,8 @@ function copyDir(src, dest, tokens) {
     }
 }
 
-function create(name, options = {}) {
+async function create(name, options = {}) {
     const {
-        template    = 'solid',
         outDir      = process.cwd(),
         installDeps = true,
     } = options;
@@ -50,6 +86,28 @@ function create(name, options = {}) {
         process.exit(1);
     }
 
+    const cliDir   = path.resolve(__dirname, '..');
+    const templates = listTemplates(cliDir);
+
+    // Resolve template — prompt if none given or the name doesn't exist yet
+    let template = options.template;
+    if (!template) {
+        if (templates.length === 0) {
+            console.error('Error: no templates found in ' + path.join(cliDir, 'templates'));
+            process.exit(1);
+        }
+        if (templates.length === 1) {
+            template = templates[0];
+        } else {
+            template = await promptTemplate(templates);
+        }
+    }
+
+    if (!name || !/^[a-zA-Z][a-zA-Z0-9_-]*$/.test(name)) {
+        console.error('Error: app name must start with a letter and contain only letters, digits, hyphens or underscores.');
+        process.exit(1);
+    }
+
     const appDir = path.join(outDir, name);
     if (fs.existsSync(appDir)) {
         console.error(`Error: directory "${appDir}" already exists.`);
@@ -73,6 +131,9 @@ function create(name, options = {}) {
         '{{APP_NAME}}':     name,
         '{{APP_TITLE}}':    appTitle,
         '{{CMAKE_TARGET}}': cmakeTarget,
+        // Resolved at create-time so vite.config / API.ts can import from the
+        // installed framework's src/ tree via the @wpp alias.
+        '{{REPO_ROOT}}': path.join(cliDir, 'framework').replace(/\\/g, '/'),
     };
 
     console.log(`\n=== WindowPP Create --- ${name} (template: ${template}) ===\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windowpp",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "WindowPP CLI — build, dev, and scaffold for WindowPP apps",
   "type": "commonjs",
   "bin": {
@@ -16,7 +16,9 @@
   ],
   "scripts": {
     "sync": "node scripts/sync-framework.js",
-    "prepublishOnly": "node scripts/sync-framework.js"
+    "sync:templates": "node scripts/sync-templates.js",
+    "sync:all": "node scripts/sync-framework.js && node scripts/sync-templates.js",
+    "prepublishOnly": "node scripts/sync-framework.js && node scripts/sync-templates.js"
   },
   "engines": {
     "node": ">=18"

package/scripts/publish.js

@@ -47,6 +47,10 @@ console.log(`\n=== windowpp publish: ${pkg.version} → ${nextVersion} (${bumpTy
 console.log('Syncing framework source...');
 execSync('node scripts/sync-framework.js', { cwd: CLI_DIR, stdio: 'inherit' });
 
+// ── Sync templates from monorepo apps ────────────────────────────────────────
+console.log('\nSyncing templates...');
+execSync('node scripts/sync-templates.js', { cwd: CLI_DIR, stdio: 'inherit' });
+
 // ── Publish with the new version (without writing it yet) ─────────────────────
 // Temporarily write the new version so npm publish picks it up, then revert on failure.
 pkg.version = nextVersion;

package/scripts/sync-templates.js

@@ -0,0 +1,238 @@
+#!/usr/bin/env node
+// cli/scripts/sync-templates.js
+//
+// Syncs app directories from the monorepo into cli/templates/ as reusable
+// project templates.  Called manually or as part of the publish flow.
+//
+// Usage:
+//   node cli/scripts/sync-templates.js            — sync all templates
+//   node cli/scripts/sync-templates.js example    — sync one by name
+
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+
+const SCRIPT_DIR    = __dirname;
+const CLI_DIR       = path.join(SCRIPT_DIR, '..');
+const REPO_ROOT     = path.join(CLI_DIR, '..');
+const TEMPLATES_DIR = path.join(CLI_DIR, 'templates');
+const BASE_TEMPLATE = path.join(TEMPLATES_DIR, 'solid');
+
+// ─── Template source configuration ───────────────────────────────────────────
+//
+// Each entry describes one template that can be used with `windowpp create`.
+// To register a new app as a template, add an entry here and run this script.
+//
+// Fields:
+//   name         — template dir name  → cli/templates/<name>/
+//   source       — source dir relative to repo root
+//   appName      — concrete npm package name in source  (replaced → {{APP_NAME}})
+//   cmakeTarget  — concrete cmake target in source      (replaced → {{CMAKE_TARGET}})
+//   appTitle     — human-readable title in source       (replaced → {{APP_TITLE}})
+//   useBase      — paths taken from the solid base template instead of source
+//                  (these need standalone-specific content not in the monorepo app)
+//   skip         — relative paths / bare file names to skip when copying from source
+
+const TEMPLATE_SOURCES = [
+    {
+        name:        'example',
+        source:      'example-app',
+        appName:     'windowpp-example',
+        cmakeTarget: 'wpp_example',
+        appTitle:    'WindowPP Example',
+        // Use the standalone-compatible versions from the solid base template
+        useBase: [
+            'CMakeLists.txt',
+            'package.json',
+            'frontend/vite.config.ts',
+        ],
+        // Skip monorepo-specific / generated / lock files
+        skip: [
+            'build.js',
+            'dev.js',
+            'frontend/node_modules',
+            'frontend/dist',
+            'frontend/pnpm-lock.yaml',
+            'frontend/package-lock.json',
+            'frontend/.gitignore',
+            'frontend/README.md',
+        ],
+    },
+    // ── To add more templates, copy an entry like this: ───────────────────────
+    // {
+    //     name:        'icup',
+    //     source:      'ICUP',
+    //     appName:     'wpp-icup',
+    //     cmakeTarget: 'wpp_icup',
+    //     appTitle:    'WindowPP ICUP',
+    //     useBase: ['CMakeLists.txt', 'package.json', 'frontend/vite.config.ts'],
+    //     skip: ['build.js', 'dev.js', 'frontend/node_modules', 'frontend/dist'],
+    // },
+];
+
+// ─── File extensions that get text/token substitution ────────────────────────
+const TEXT_EXTENSIONS = new Set([
+    '.cpp', '.h', '.ts', '.tsx', '.js', '.json', '.html',
+    '.css', '.md', '.txt', '.cmake', '.sh', '.env',
+]);
+
+// ─── Build the list of [from, to] string substitution pairs for an entry ─────
+//
+// Transforms applied to all text files:
+//
+//  1. Concrete app name / cmake target / title → template tokens
+//
+//  2. TypeScript relative imports from frontend/src/ depth (3 levels up to src/):
+//       '../../../src/Foo'  →  '@wpp/Foo'
+//     Covered by the vite alias:  '@wpp' → resolve(REPO_ROOT, 'src')
+//
+//  3. TypeScript relative imports from frontend/ depth (2 levels up):
+//       '../../src/Foo'     →  '@wpp/Foo'
+//
+//  4. C++ #include relative back to src/:
+//       "#include "../src/Foo/bar.h"" → "#include "Foo/bar.h""
+//     Works because CMakeLists adds  target_include_directories(...PRIVATE "${WPP_FRAMEWORK_DIR}/src")
+
+function buildTokens(entry) {
+    return [
+        // ── Name tokens (longer strings first to avoid partial matches) ─────
+        [entry.appName,      '{{APP_NAME}}'],
+        [entry.cmakeTarget,  '{{CMAKE_TARGET}}'],
+        [entry.appTitle,     '{{APP_TITLE}}'],
+
+        // ── TypeScript/TSX: monorepo-relative imports from frontend/src/ ────
+        ["'../../../src/",   "'@wpp/"],
+        ['"../../../src/',   '"@wpp/'],
+
+        // ── TypeScript/TSX: from frontend/ level ───────────────────────────
+        ["'../../src/",      "'@wpp/"],
+        ['"../../src/',      '"@wpp/'],
+
+        // ── C++ includes: "../src/SubDir/file.h" → "SubDir/file.h" ─────────
+        // (CMakeLists adds ${WPP_FRAMEWORK_DIR}/src as a private include dir)
+        ['"../src/',         '"'],
+    ];
+}
+
+function applyTokens(content, tokens) {
+    for (const [from, to] of tokens) {
+        content = content.split(from).join(to);
+    }
+    return content;
+}
+
+// ─── File copy helpers ───────────────────────────────────────────────────────
+function copyFileTransformed(src, dest, tokens) {
+    const ext = path.extname(src).toLowerCase();
+    if (TEXT_EXTENSIONS.has(ext)) {
+        let content = fs.readFileSync(src, 'utf8');
+        content = applyTokens(content, tokens);
+        fs.writeFileSync(dest, content, 'utf8');
+    } else {
+        fs.copyFileSync(src, dest);
+    }
+}
+
+// Copy a directory recursively, respecting a per-directory skip set.
+// relPath tracks the path relative to the template root for skip matching.
+function copySourceDir(src, dest, tokens, skipRelPaths, relPrefix) {
+    fs.mkdirSync(dest, { recursive: true });
+    for (const dirent of fs.readdirSync(src, { withFileTypes: true })) {
+        const relPath = relPrefix ? `${relPrefix}/${dirent.name}` : dirent.name;
+        // Skip if matched by bare name OR by relative path
+        if (skipRelPaths.has(dirent.name) || skipRelPaths.has(relPath)) continue;
+
+        const srcPath  = path.join(src, dirent.name);
+        const destPath = path.join(dest, dirent.name);
+
+        if (dirent.isDirectory()) {
+            copySourceDir(srcPath, destPath, tokens, skipRelPaths, relPath);
+        } else {
+            copyFileTransformed(srcPath, destPath, tokens);
+        }
+    }
+}
+
+// ─── Sync a single template entry ────────────────────────────────────────────
+function syncTemplate(entry) {
+    const srcDir  = path.join(REPO_ROOT, entry.source);
+    const destDir = path.join(TEMPLATES_DIR, entry.name);
+
+    if (!fs.existsSync(srcDir)) {
+        console.warn(`  ⚠  source not found: ${entry.source} — skipping`);
+        return 0;
+    }
+
+    // Clear and recreate the destination template directory
+    if (fs.existsSync(destDir)) {
+        fs.rmSync(destDir, { recursive: true, force: true });
+    }
+    fs.mkdirSync(destDir, { recursive: true });
+
+    const tokens      = buildTokens(entry);
+    const useBaseSet  = new Set(entry.useBase  ?? []);
+    const skipRelPaths = new Set(entry.skip ?? []);
+
+    // Also skip the "useBase" paths when copying from source
+    for (const rel of useBaseSet) skipRelPaths.add(rel);
+
+    let count = 0;
+
+    // 1. Overlay "base" files from cli/templates/solid/ (with this entry's tokens)
+    for (const rel of useBaseSet) {
+        const baseSrc  = path.join(BASE_TEMPLATE, rel);
+        const baseDest = path.join(destDir, rel);
+        if (!fs.existsSync(baseSrc)) {
+            console.warn(`    ⚠  base file not found: ${rel}`);
+            continue;
+        }
+        fs.mkdirSync(path.dirname(baseDest), { recursive: true });
+        copyFileTransformed(baseSrc, baseDest, tokens);
+        count++;
+    }
+
+    // 2. Copy everything else from the source app
+    copySourceDir(srcDir, destDir, tokens, skipRelPaths, '');
+
+    // Count total destination files
+    count = countFiles(destDir);
+    return count;
+}
+
+function countFiles(dir) {
+    let n = 0;
+    for (const dirent of fs.readdirSync(dir, { withFileTypes: true })) {
+        if (dirent.isDirectory()) n += countFiles(path.join(dir, dirent.name));
+        else n++;
+    }
+    return n;
+}
+
+// ─── Entry point ─────────────────────────────────────────────────────────────
+function run() {
+    const filter  = process.argv[2];   // optional: name of one template to sync
+    const targets = filter
+        ? TEMPLATE_SOURCES.filter(e => e.name === filter)
+        : TEMPLATE_SOURCES;
+
+    if (filter && targets.length === 0) {
+        const names = TEMPLATE_SOURCES.map(e => e.name).join(', ');
+        console.error(`\nNo template named "${filter}". Available: ${names || '(none)'}\n`);
+        process.exit(1);
+    }
+
+    console.log('\n=== windowpp: syncing templates ===\n');
+
+    let total = 0;
+    for (const entry of targets) {
+        process.stdout.write(`  ${entry.source}  →  templates/${entry.name}/  ...`);
+        const n = syncTemplate(entry);
+        process.stdout.write(`  ${n} file(s)\n`);
+        total += n;
+    }
+
+    console.log(`\n✓ Synced ${targets.length} template(s) (${total} total files)\n`);
+}
+
+run();

package/templates/example/CMakeLists.txt

@@ -0,0 +1,59 @@
+cmake_minimum_required(VERSION 3.16)
+project({{CMAKE_TARGET}} VERSION 0.1.0 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Python3 REQUIRED COMPONENTS Interpreter)
+
+# ─── WindowPP Framework ───────────────────────────────────────────────────────
+# WPP_FRAMEWORK_DIR is injected by `windowpp build` / `windowpp dev`.
+# To build manually without the CLI:
+#   cmake -S . -B build -DWPP_FRAMEWORK_DIR=/path/to/windowpp/framework
+if(NOT DEFINED WPP_FRAMEWORK_DIR)
+    message(FATAL_ERROR
+        "WPP_FRAMEWORK_DIR is not set.\n"
+        "  Build via:  windowpp build\n"
+        "  Or pass:    -DWPP_FRAMEWORK_DIR=<path/to/windowpp/cli/framework>"
+    )
+endif()
+
+add_subdirectory("${WPP_FRAMEWORK_DIR}" "${CMAKE_BINARY_DIR}/windowpp_lib")
+
+# ─── App Target ───────────────────────────────────────────────────────────────
+
+set(GENERATED_DIR       ${CMAKE_BINARY_DIR}/generated)
+set(EMBEDDED_ASSETS_CPP ${GENERATED_DIR}/embedded_assets.cpp)
+set(EMBEDDED_ASSETS_H   ${GENERATED_DIR}/embedded_assets.h)
+
+add_custom_command(
+    OUTPUT  ${EMBEDDED_ASSETS_CPP} ${EMBEDDED_ASSETS_H}
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${GENERATED_DIR}
+    COMMAND ${Python3_EXECUTABLE}
+            ${WPP_EMBED_SCRIPT}
+            ${CMAKE_CURRENT_SOURCE_DIR}/frontend/dist
+            ${EMBEDDED_ASSETS_CPP}
+            ${EMBEDDED_ASSETS_H}
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/frontend/dist/index.html
+    COMMENT "Embedding {{APP_TITLE}} frontend assets into C++ byte arrays..."
+    VERBATIM
+)
+
+set_source_files_properties(
+    ${EMBEDDED_ASSETS_CPP}
+    ${EMBEDDED_ASSETS_H}
+    PROPERTIES GENERATED TRUE
+)
+
+add_custom_target({{CMAKE_TARGET}}_frontend_assets ALL
+    DEPENDS ${EMBEDDED_ASSETS_CPP} ${EMBEDDED_ASSETS_H}
+)
+
+add_executable({{CMAKE_TARGET}} main.cpp ${EMBEDDED_ASSETS_CPP})
+target_include_directories({{CMAKE_TARGET}} PRIVATE
+    ${GENERATED_DIR}
+    "${WPP_FRAMEWORK_DIR}/src"   # bridge headers: AppData/, FileSystem/, Input/, platform/
+)
+target_compile_definitions({{CMAKE_TARGET}} PRIVATE WPP_EMBEDDED_ASSETS)
+target_link_libraries({{CMAKE_TARGET}} PRIVATE windowpp windowpp_deps nlohmann_json::nlohmann_json)
+add_dependencies({{CMAKE_TARGET}} {{CMAKE_TARGET}}_frontend_assets)

package/templates/example/frontend/index.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <title>Solid App</title>
+    <script>
+      // Kill WebView2/browser default "open file" on drag-and-drop
+      window.addEventListener('dragover', function(e) { e.preventDefault(); }, false);
+      window.addEventListener('drop', function(e) { e.preventDefault(); }, false);
+    </script>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+
+    <script src="/src/index.tsx" type="module"></script>
+  </body>
+</html>

package/templates/example/frontend/src/API.ts

@@ -0,0 +1,56 @@
+// ─── AppData ─────────────────────────────────────────────────────────────────
+export type { AppDataEntry, SeedEntry } from '@wpp/AppData/API/AppData';
+export { default as appData } from '@wpp/AppData/API/AppData';
+
+// ─── FileSystem ───────────────────────────────────────────────────────────────
+export type {
+  FileStat,
+  DirEntry,
+  ApplicationEntry,
+  SearchOptions,
+  SearchStreamSummary,
+  SearchStreamCallbacks,
+  SearchStreamHandle,
+} from '@wpp/FileSystem/API/FileSystem';
+export { default as filesystem } from '@wpp/FileSystem/API/FileSystem';
+
+// ─── FileDrop ─────────────────────────────────────────────────────────────────
+export type { FileInfo, DropZone } from '@wpp/filedrop/filedrop';
+export {
+  fileDrop,
+  formatFileSize,
+  createDropZone,
+  filterFilesByExtension,
+  filterFilesByMimeType,
+  isImageFile,
+  isVideoFile,
+  isAudioFile,
+  isTextFile,
+} from '@wpp/filedrop/filedrop';
+
+// ─── Input ────────────────────────────────────────────────────────────────────
+export type { InputKeyEvent, ShortcutEvent } from '@wpp/Input/API/Input';
+export { default as input } from '@wpp/Input/API/Input';
+
+// ─── App (platform) ──────────────────────────────────────────────────────────
+export type {
+  AppInfo,
+  Point,
+  Size,
+  Rect,
+  MonitorInfo,
+  ClipboardChangedEvent,
+  AppEvent,
+} from '@wpp/platform/API/App';
+export { default as appApi } from '@wpp/platform/API/App';
+
+// ─── Window (platform) ───────────────────────────────────────────────────────
+export type {
+  WindowState,
+  WindowInfo,
+  ResizeDetail,
+  MoveDetail,
+  WindowEvent,
+  CreateWindowOptions,
+} from '@wpp/platform/API/Window';
+export { default as windowApi } from '@wpp/platform/API/Window';