@flare-desktop/cli 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flare-desktop/cli",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Command line interface for the flare desktop toolkit",
   "type": "module",
   "bin": {

package/src/commands/dev.js

@@ -1,6 +1,6 @@
 import { setTimeout as delay } from "node:timers/promises";
 
-import { compileApplication, runHook } from "../lib/build.js";
+import { compileApplication, ensureFrontendDirectory, runHook } from "../lib/build.js";
 import { FlareError } from "../lib/errors.js";
 import { loadProject, productName } from "../lib/project.js";
 import { run, startShell, terminate } from "../lib/process.js";
@@ -48,6 +48,12 @@ export async function devCommand(context) {
   process.once("SIGTERM", sigtermHandler);
 
   try {
+    await ensureFrontendDirectory({
+      projectDirectory: context.projectDirectory,
+      config,
+      logger: context.logger
+    });
+
     if (config.build.beforeDevCommand) {
       context.logger.info(`before dev command: ${config.build.beforeDevCommand}`);
       server = startShell(config.build.beforeDevCommand, { cwd: context.projectDirectory });
@@ -61,8 +67,8 @@ export async function devCommand(context) {
     const { binary } = await compileApplication({
       projectDirectory: context.projectDirectory,
       config,
-    configFile: context.flags.config || "flare.config.json",
-    environment: context.flags.environment,
+      configFile: context.flags.config || "flare.config.json",
+      environment: context.flags.environment,
       mode: "Debug",
       logger: context.logger
     });

package/src/commands/init.js

@@ -6,6 +6,7 @@ import { placeholderIcon } from "../lib/icons.js";
 import { isValidAppName, toKebabCase } from "../lib/project.js";
 import { installSdk } from "../lib/sdk.js";
 import { writePng } from "../lib/png.js";
+import { runShell } from "../lib/process.js";
 import { CORE_VERSION, MIN_CLI_VERSION } from "../release-versions.js";
 import {
   cmakeTemplate,
@@ -36,6 +37,7 @@ export async function initProject({
   template = "javascript",
   sdkMode = "source",
   sdkFetch,
+  installDependencies = false,
   force = false,
   logger
 }) {
@@ -121,12 +123,25 @@ export async function initProject({
 
   const written = [...files.map((entry) => entry.file), "icons/icon.png", "icons/32x32.png"];
 
+  if (installDependencies) {
+    if (logger) logger.info("installing project dependencies with npm");
+    let result;
+    try {
+      result = await runShell("npm install --no-audit --no-fund", { cwd: targetDirectory });
+    } catch (error) {
+      throw new FlareError(`npm install could not start in '${targetDirectory}': ${error.message}; run npm install manually`);
+    }
+    if (result.code !== 0) {
+      throw new FlareError(`npm install failed in '${targetDirectory}' (code ${result.code}); the project was kept, run npm install manually`);
+    }
+  }
+
   if (logger) {
     logger.info(`created project '${projectName}' in '${targetDirectory}'`);
     logger.info("");
     logger.info("next steps:");
     logger.step(`cd ${path.relative(process.cwd(), targetDirectory) || "."}`);
-    logger.step("npm install");
+    if (!installDependencies) logger.step("npm install");
     logger.step("npm run dev");
   }
 

package/src/lib/build.js

@@ -1,3 +1,5 @@
+import { existsSync } from "node:fs";
+
 import { buildDirectory, buildProject, configureProject, findExecutable } from "./cmake.js";
 import { FlareError } from "./errors.js";
 import { binaryName, frontendDirectory } from "./project.js";
@@ -10,14 +12,35 @@ export async function runHook(command, { cwd, env, logger, label }) {
   if (result.code !== 0) throw new FlareError(`${label} failed with code ${result.code}`);
 }
 
+export async function ensureFrontendDirectory({ projectDirectory, config, logger }) {
+  const frontend = frontendDirectory(projectDirectory, config);
+  if (existsSync(frontend)) return;
+  if (!config.build.beforeBuildCommand) {
+    throw new FlareError(`frontend directory '${frontend}' is missing and no beforeBuildCommand is configured`);
+  }
+  logger.info("preparing frontend assets for CMake embedding");
+  await runHook(config.build.beforeBuildCommand, {
+    cwd: projectDirectory,
+    logger,
+    label: "frontend build command"
+  });
+  if (!existsSync(frontend)) {
+    throw new FlareError(`frontend build command did not create '${frontend}'`);
+  }
+}
+
 export async function compileApplication({ projectDirectory, config, mode, env, logger, configFile, environment }) {
+  const frontend = frontendDirectory(projectDirectory, config);
+  if (!existsSync(frontend)) {
+    throw new FlareError(`frontend directory '${frontend}' is missing; run the frontend build command before compiling`);
+  }
   const directory = buildDirectory(projectDirectory, mode);
   await configureProject(projectDirectory, {
     directory,
     mode,
     env,
     logger,
-    frontendDirectory: frontendDirectory(projectDirectory, config),
+    frontendDirectory: frontend,
     configFile,
     environment
   });

package/src/lib/cmake.js

@@ -35,24 +35,37 @@ export function buildDirectory(projectDirectory, mode) {
   return path.join(projectDirectory, "build", mode === "Debug" ? "debug" : "release");
 }
 
+export function msvcUtf8Arguments(directory, { platform = process.platform, cxxFlags = process.env.CXXFLAGS ?? "" } = {}) {
+  if (platform !== "win32") return [];
+  const cacheFile = path.join(directory, "CMakeCache.txt");
+  const cache = existsSync(cacheFile) ? readFileSync(cacheFile, "utf8") : "";
+  const existing = cache.match(/^CMAKE_CXX_FLAGS:STRING=(.*)$/m)?.[1] ?? cxxFlags;
+  if (/(?:^|\s)\/utf-8(?:\s|$)/i.test(existing)) return [];
+  return [`-DCMAKE_CXX_FLAGS:STRING=${[existing.trim(), "/utf-8"].filter(Boolean).join(" ")}`];
+}
+
 export async function configureProject(projectDirectory, { directory, mode, env, logger, frontendDirectory, configFile = "flare.config.json", environment = "production" }) {
   if (!cmakeVersion()) throw new FlareError("cmake was not found in PATH");
   const outputDirectory = path.join(directory, "bin");
   const configuration = mode.toUpperCase();
+  const generator = process.env.CMAKE_GENERATOR ?? "";
+  const multiConfiguration = generator
+    ? /^(Visual Studio|Xcode|Ninja Multi-Config)/.test(generator)
+    : process.platform === "win32";
+  const prebuiltSdk = existsSync(path.join(projectDirectory, "vendor", "flare", "sdk-manifest.json"));
   const args = [
     "-S",
     projectDirectory,
     "-B",
     directory,
     ...generatorArguments(),
-    `-DCMAKE_BUILD_TYPE=${mode}`,
+    ...(!multiConfiguration ? [`-DCMAKE_BUILD_TYPE=${mode}`] : []),
     `-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${outputDirectory}`,
     `-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_${configuration}=${outputDirectory}`,
     "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",
     `-DFLARE_FRONTEND_DIR=${frontendDirectory ?? path.join(projectDirectory, "frontend")}`,
-    "-DFLARE_BUILD_EXAMPLES=OFF",
-    "-DFLARE_BUILD_TESTS=OFF",
-    "-DFLARE_INSTALL=OFF"
+    ...(!prebuiltSdk ? ["-DFLARE_BUILD_EXAMPLES=OFF", "-DFLARE_BUILD_TESTS=OFF", "-DFLARE_INSTALL=OFF"] : []),
+    ...msvcUtf8Arguments(directory, { cxxFlags: env?.CXXFLAGS ?? process.env.CXXFLAGS ?? "" })
   ];
   logger.debug(`cmake ${args.join(" ")}`);
   const result = await run("cmake", args, { cwd: projectDirectory, env });

package/src/lib/icons.js

@@ -1,23 +1,13 @@
+import { readFileSync } from "node:fs";
+
 import { FlareError } from "./errors.js";
-import { resizePng, writePng } from "./png.js";
+import { readPng, resizePng, writePng } from "./png.js";
+
+let defaultMark;
 
 export function placeholderIcon(size = 512) {
-  const data = Buffer.alloc(size * size * 4);
-  const center = (size - 1) / 2;
-  const radius = size * 0.46;
-  for (let y = 0; y < size; y += 1) {
-    for (let x = 0; x < size; x += 1) {
-      const target = (y * size + x) * 4;
-      const distance = Math.hypot(x - center, y - center) / radius;
-      const glow = Math.max(0, Math.min(1, 1 - Math.abs(distance - 0.55) * 1.6));
-      const edge = distance <= 1 ? 1 : 0;
-      data[target] = edge ? Math.round(44 + 172 * glow) : 0;
-      data[target + 1] = edge ? Math.round(35 + 132 * glow) : 0;
-      data[target + 2] = edge ? Math.round(40 + 137 * glow) : 0;
-      data[target + 3] = edge ? 255 : 0;
-    }
-  }
-  return { width: size, height: size, data };
+  defaultMark ??= readPng(readFileSync(new URL("../assets/flare-mark.png", import.meta.url)));
+  return resizePng(defaultMark, size, size);
 }
 
 const ICO_SIZES = [16, 24, 32, 48, 64, 128, 256];

package/src/templates/project.js

@@ -94,6 +94,9 @@ FetchContent_MakeAvailable(flare)`}
 
 add_executable(${name} source/main.cpp)
 target_link_libraries(${name} PRIVATE flare::core flare::assets)
+if(MSVC)
+    target_compile_options(${name} PRIVATE /utf-8)
+endif()
 
 find_program(FLARE_NODE_EXECUTABLE node REQUIRED)
 set(FLARE_CONFIG_FILE "flare.config.json" CACHE STRING "Source application configuration")