windowpp 0.1.1 → 0.1.2

package/lib/create.js

@@ -1,283 +1,95 @@
-#!/usr/bin/env node
-// cli/lib/create.js — WindowPP app scaffolding
-//
-// Copies a template from cli/templates/<template>/ to <outDir>/<name>/,
-// substituting {{APP_NAME}}, {{APP_TITLE}}, and {{CMAKE_TARGET}} in all
-// text files.  Each created app is a self-contained project; it does NOT
-// need to live inside the framework repo.
-//
-// Usage (via CLI):
-//   windowpp create my-app [--template solid] [--out-dir .]
-
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const { execSync } = require('child_process');
-
-function create(name, options = {}) {
-    const {
-        template = 'solid',
-        outDir = process.cwd(),
-        installDeps = true,
-    } = options;
-
-    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.`);
-        process.exit(1);
-    }
-
-    const cliDir = path.resolve(__dirname, '..');
-    const templateDir = path.join(cliDir, 'templates', template);
-    if (!fs.existsSync(templateDir)) {
-        console.error(`Error: template "${template}" not found in ${path.join(cliDir, 'templates')}`);
-        process.exit(1);
-    }
-
-    const cmakeTarget = name.replace(/-/g, '_');
-    const appTitle = name
-        .split(/[-_]/)
-        .map(w => w.charAt(0).toUpperCase() + w.slice(1))
-        .join(' ');
-
-    const tokens = {
-        '{{APP_NAME}}':     name,
-        '{{APP_TITLE}}':    appTitle,
-        '{{CMAKE_TARGET}}': cmakeTarget,
-    };
-
-    console.log(`\n=== WindowPP Create — ${name} (template: ${template}) ===\n`);
-    console.log(`Scaffolding into: ${appDir}\n`);
-
-    // ── Copy template ─────────────────────────────────────────────────────────
-    copyDir(templateDir, appDir, tokens);
-
-    // ── Install frontend deps ─────────────────────────────────────────────────
-    const frontendDir = path.join(appDir, 'frontend');
-    if (installDeps && fs.existsSync(frontendDir)) {
-        console.log('Installing frontend dependencies...');
-        execSync('npm install', { cwd: frontendDir, stdio: 'inherit' });
-    }
-
-    console.log(`\n✓ Created "${name}"\n`);
-    console.log('Next steps:');
-    console.log(`  cd ${name}`);
-    console.log('  windowpp dev\n');
-}
-
-// ── Helpers ───────────────────────────────────────────────────────────────────
-
-function copyDir(src, dest, tokens) {
-    fs.mkdirSync(dest, { recursive: true });
-    for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
-        const srcPath  = path.join(src, entry.name);
-        const destPath = path.join(dest, entry.name);
-        if (entry.isDirectory()) {
-            copyDir(srcPath, destPath, tokens);
-        } else {
-            copyFile(srcPath, destPath, tokens);
-        }
-    }
-}
-
-const TEXT_EXTENSIONS = new Set([
-    '.cpp', '.h', '.ts', '.tsx', '.js', '.json', '.html',
-    '.css', '.md', '.txt', '.cmake', '.sh', '.env',
-]);
-
-function copyFile(src, dest, tokens) {
-    const ext = path.extname(src).toLowerCase();
-    if (TEXT_EXTENSIONS.has(ext)) {
-        let content = fs.readFileSync(src, 'utf8');
-        for (const [token, value] of Object.entries(tokens)) {
-            content = content.split(token).join(value);
-        }
-        fs.writeFileSync(dest, content, 'utf8');
-    } else {
-        fs.copyFileSync(src, dest);
-    }
-}
-
-module.exports = { create };
-
-
-function create(name, options = {}) {
-    const {
-        template = 'solid',
-        outDir = process.cwd(),
-        installDeps = true,
-    } = options;
-
-    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.`);
-        process.exit(1);
-    }
-
-    const cliDir = path.resolve(__dirname, '..');
-    const templateDir = path.join(cliDir, 'templates', template);
-    if (!fs.existsSync(templateDir)) {
-        console.error(`Error: template "${template}" not found in ${path.join(cliDir, 'templates')}`);
-        process.exit(1);
-    }
-
-    const rootDir = findRootDir(outDir);
-
-    // cmake target name: replace hyphens with underscores
-    const cmakeTarget = name.replace(/-/g, '_');
-    const appTitle = name
-        .split(/[-_]/)
-        .map(w => w.charAt(0).toUpperCase() + w.slice(1))
-        .join(' ');
-
-    const tokens = {
-        '{{APP_NAME}}': name,
-        '{{APP_TITLE}}': appTitle,
-        '{{CMAKE_TARGET}}': cmakeTarget,
-        '{{REPO_ROOT}}': rootDir.replace(/\\/g, '/'),
-    };
-
-    console.log(`\n=== WindowPP Create — ${name} (template: ${template}) ===\n`);
-    console.log(`Scaffolding into: ${appDir}\n`);
-
-    // ── Copy template ─────────────────────────────────────────────────────────
-    copyDir(templateDir, appDir, tokens);
-
-    // ── Register in CMakeLists.txt ────────────────────────────────────────────
-    const appDirRelative = path.relative(rootDir, appDir).replace(/\\/g, '/');
-    addToCMake(rootDir, name, cmakeTarget, appDirRelative);
-
-    // ── Install frontend deps ─────────────────────────────────────────────────
-    const frontendDir = path.join(appDir, 'frontend');
-    if (installDeps && fs.existsSync(frontendDir)) {
-        console.log('Installing frontend dependencies...');
-        execSync('npm install', { cwd: frontendDir, stdio: 'inherit' });
-    }
-
-    console.log(`\n✓ Created "${name}"\n`);
-    console.log('Next steps:');
-    console.log(`  cd ${name}`);
-    console.log('  windowpp dev\n');
-}
-
-// ── Helpers ───────────────────────────────────────────────────────────────────
-
-function copyDir(src, dest, tokens) {
-    fs.mkdirSync(dest, { recursive: true });
-    for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
-        const srcPath = path.join(src, entry.name);
-        const destPath = path.join(dest, entry.name);
-        if (entry.isDirectory()) {
-            copyDir(srcPath, destPath, tokens);
-        } else {
-            copyFile(srcPath, destPath, tokens);
-        }
-    }
-}
-
-const TEXT_EXTENSIONS = new Set([
-    '.cpp', '.h', '.ts', '.tsx', '.js', '.json', '.html',
-    '.css', '.md', '.txt', '.cmake', '.sh', '.env',
-]);
-
-function copyFile(src, dest, tokens) {
-    const ext = path.extname(src).toLowerCase();
-    if (TEXT_EXTENSIONS.has(ext)) {
-        let content = fs.readFileSync(src, 'utf8');
-        for (const [token, value] of Object.entries(tokens)) {
-            content = content.split(token).join(value);
-        }
-        fs.writeFileSync(dest, content, 'utf8');
-    } else {
-        fs.copyFileSync(src, dest);
-    }
-}
-
-function addToCMake(rootDir, appName, cmakeTarget, appDirRelative) {
-    const cmakePath = path.join(rootDir, 'CMakeLists.txt');
-    let cmake = fs.readFileSync(cmakePath, 'utf8');
-
-    // Insert before the # ─── Install section
-    const installMarker = '# ─── Install ──';
-    if (!cmake.includes(installMarker)) {
-        console.warn('Warning: could not locate Install section in CMakeLists.txt — skipping auto-registration.');
-        return;
-    }
-
-    const appBlock = generateCMakeBlock(appName, cmakeTarget, appDirRelative);
-    cmake = cmake.replace(installMarker, appBlock + '\n' + installMarker);
-    fs.writeFileSync(cmakePath, cmake, 'utf8');
-    console.log(`Registered ${cmakeTarget} in CMakeLists.txt`);
-}
-
-function generateCMakeBlock(appName, cmakeTarget, appDirRelative) {
-    const generatedVar = cmakeTarget.toUpperCase() + '_GENERATED_DIR';
-    const embeddedCppVar = cmakeTarget.toUpperCase() + '_EMBEDDED_ASSETS_CPP';
-    const embeddedHVar = cmakeTarget.toUpperCase() + '_EMBEDDED_ASSETS_H';
-    const assetsTarget = cmakeTarget + '_frontend_assets';
-
-    return `# ─── ${appName} ──────────────────────────────────────────────────────────────────
-
-if(WPP_BUILD_EXAMPLES)
-    add_executable(${cmakeTarget} ${appDirRelative}/main.cpp)
-    target_link_libraries(${cmakeTarget} PRIVATE windowpp nlohmann_json::nlohmann_json)
-    if(WIN32 AND WEBVIEW2_INCLUDE_DIR)
-        target_include_directories(${cmakeTarget} PRIVATE \${WEBVIEW2_INCLUDE_DIR})
-        if(WEBVIEW2_STATIC)
-            target_link_libraries(${cmakeTarget} PRIVATE
-                \${CMAKE_CURRENT_SOURCE_DIR}/src/renderer/webview/x64/WebView2LoaderStatic.lib
-                version)
-        else()
-            target_link_libraries(${cmakeTarget} PRIVATE
-                \${CMAKE_CURRENT_SOURCE_DIR}/src/renderer/webview/x64/WebView2Loader.lib)
-        endif()
-    endif()
-
-    set(${generatedVar}        \${CMAKE_BINARY_DIR}/generated_${cmakeTarget})
-    set(${embeddedCppVar}  \${${generatedVar}}/embedded_assets.cpp)
-    set(${embeddedHVar}    \${${generatedVar}}/embedded_assets.h)
-
-    add_custom_command(
-        OUTPUT  \${${embeddedCppVar}} \${${embeddedHVar}}
-        COMMAND \${CMAKE_COMMAND} -E make_directory \${${generatedVar}}
-        COMMAND \${Python3_EXECUTABLE}
-                \${WPP_EMBED_SCRIPT}
-                \${CMAKE_CURRENT_SOURCE_DIR}/${appDirRelative}/frontend/dist
-                \${${embeddedCppVar}}
-                \${${embeddedHVar}}
-        DEPENDS \${CMAKE_CURRENT_SOURCE_DIR}/${appDirRelative}/frontend/dist/index.html
-        COMMENT "Embedding ${appName} frontend assets into C++ byte arrays..."
-        VERBATIM
-    )
-
-    set_source_files_properties(
-        \${${embeddedCppVar}}
-        \${${embeddedHVar}}
-        PROPERTIES GENERATED TRUE
-    )
-
-    add_custom_target(${assetsTarget} ALL
-        DEPENDS \${${embeddedCppVar}} \${${embeddedHVar}}
-    )
-
-    target_sources(${cmakeTarget} PRIVATE \${${embeddedCppVar}})
-    target_include_directories(${cmakeTarget} PRIVATE \${${generatedVar}})
-    target_compile_definitions(${cmakeTarget} PRIVATE WPP_EMBEDDED_ASSETS)
-    add_dependencies(${cmakeTarget} ${assetsTarget})
-endif()
-
-`;
-}
-
-module.exports = { create };
+#!/usr/bin/env node
+// cli/lib/create.js — WindowPP app scaffolding
+
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const { execSync } = require('child_process');
+
+const TEXT_EXTENSIONS = new Set([
+    '.cpp', '.h', '.ts', '.tsx', '.js', '.json', '.html',
+    '.css', '.md', '.txt', '.cmake', '.sh', '.env',
+]);
+
+function copyFile(src, dest, tokens) {
+    const ext = path.extname(src).toLowerCase();
+    if (TEXT_EXTENSIONS.has(ext)) {
+        let content = fs.readFileSync(src, 'utf8');
+        for (const [token, value] of Object.entries(tokens)) {
+            content = content.split(token).join(value);
+        }
+        fs.writeFileSync(dest, content, 'utf8');
+    } else {
+        fs.copyFileSync(src, dest);
+    }
+}
+
+function copyDir(src, dest, tokens) {
+    fs.mkdirSync(dest, { recursive: true });
+    for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+        const srcPath  = path.join(src, entry.name);
+        const destPath = path.join(dest, entry.name);
+        if (entry.isDirectory()) {
+            copyDir(srcPath, destPath, tokens);
+        } else {
+            copyFile(srcPath, destPath, tokens);
+        }
+    }
+}
+
+function create(name, options = {}) {
+    const {
+        template    = 'solid',
+        outDir      = process.cwd(),
+        installDeps = true,
+    } = options;
+
+    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.`);
+        process.exit(1);
+    }
+
+    const cliDir      = path.resolve(__dirname, '..');
+    const templateDir = path.join(cliDir, 'templates', template);
+    if (!fs.existsSync(templateDir)) {
+        console.error(`Error: template "${template}" not found in ${path.join(cliDir, 'templates')}`);
+        process.exit(1);
+    }
+
+    const cmakeTarget = name.replace(/-/g, '_');
+    const appTitle = name
+        .split(/[-_]/)
+        .map(w => w.charAt(0).toUpperCase() + w.slice(1))
+        .join(' ');
+
+    const tokens = {
+        '{{APP_NAME}}':     name,
+        '{{APP_TITLE}}':    appTitle,
+        '{{CMAKE_TARGET}}': cmakeTarget,
+    };
+
+    console.log(`\n=== WindowPP Create --- ${name} (template: ${template}) ===\n`);
+    console.log(`Scaffolding into: ${appDir}\n`);
+
+    copyDir(templateDir, appDir, tokens);
+
+    const frontendDir = path.join(appDir, 'frontend');
+    if (installDeps && fs.existsSync(frontendDir)) {
+        console.log('Installing frontend dependencies...');
+        execSync('npm install', { cwd: frontendDir, stdio: 'inherit' });
+    }
+
+    console.log(`\n-- Created "${name}"\n`);
+    console.log('Next steps:');
+    console.log(`  cd ${name}`);
+    console.log('  windowpp dev\n');
+}
+
+module.exports = { create };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windowpp",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "WindowPP CLI — build, dev, and scaffold for WindowPP apps",
   "type": "commonjs",
   "bin": {