auramaxx 0.0.19 → 0.1.0

package/src/server/cli/commands/create.ts

@@ -1,206 +1,161 @@
 import { execFileSync } from 'child_process';
-import fs from 'fs';
+import { existsSync } from 'fs';
 import path from 'path';
-import { printBanner, printSection, printComplete, paint, ANSI } from '../lib/theme';
+import { fileURLToPath } from 'url';
+import { printBanner, printSection, paint, ANSI } from '../lib/theme';
 import { promptInput, promptSelect } from '../lib/prompt';
 
-const AURA_CONFIG_TEMPLATE = {
-  window: {
-    title: '{{NAME}}',
-    width: 1280,
-    height: 720,
-    resizable: true,
-    fullscreen: false,
-    vsync: true,
-    hidpi: true,
-  },
-  build: {
-    entry: 'src/main.js',
-    outDir: 'build',
-    assetDir: 'assets',
-    assetMode: 'embed',
-  },
-  modules: {
-    physics: false,
-    network: false,
-    steam: false,
-  },
+const TEMPLATE_OPTIONS = [
+  { value: '2d-shooter', label: '[2D] Shooter', aliases: ['1', '2', '2d', 'shooter', '2d shooter'] },
+  { value: '3d-platformer', label: '[3D] Platformer', aliases: ['3', '3d', 'platformer', 'platformers', '3d platformer'] },
+  { value: 'blank', label: 'Blank', aliases: ['b'] },
+];
+
+const VALID_TEMPLATES = new Set(TEMPLATE_OPTIONS.map((option) => option.value));
+const TEMPLATE_ALIASES: Record<string, string> = {
+  '2d': '2d-shooter',
+  'shooter': '2d-shooter',
+  '2d shooter': '2d-shooter',
+  '2d-shooter': '2d-shooter',
+  '3d': '3d-platformer',
+  'platformer': '3d-platformer',
+  'platformers': '3d-platformer',
+  '3d platformer': '3d-platformer',
+  '3d-platformer': '3d-platformer',
+  'blank': 'blank',
 };
+const COMMAND_DIR = path.dirname(fileURLToPath(import.meta.url));
+const LOCAL_AURAJS_CLI = path.resolve(
+  COMMAND_DIR,
+  '../../../../../packages/aurascript/src/cli/src/cli.mjs',
+);
+
+function parseArgs(argv: string[]) {
+  let name: string | null = null;
+  let template: string | null = null;
+  const passthrough: string[] = [];
+
+  for (let i = 0; i < argv.length; i += 1) {
+    const arg = argv[i];
+
+    if (arg === '--help' || arg === '-h') {
+      return { help: true, name, template, passthrough };
+    }
+
+    if (arg === '--template') {
+      template = argv[i + 1] || null;
+      i += 1;
+      continue;
+    }
+
+    if (arg.startsWith('--template=')) {
+      template = arg.slice('--template='.length);
+      continue;
+    }
+
+    if (!name && !arg.startsWith('--')) {
+      name = arg;
+      continue;
+    }
+
+    passthrough.push(arg);
+  }
 
-const MAIN_JS_TEMPLATE = `// {{NAME}} — built with AuraJS
+  return { help: false, name, template, passthrough };
+}
 
-let x = 400;
-let y = 300;
-let speed = 200;
+function normalizeTemplate(value: string | null): string | null {
+  if (!value) return null;
+  const normalized = value.trim().toLowerCase();
+  if (normalized.length === 0) return null;
+  return TEMPLATE_ALIASES[normalized] || normalized;
+}
 
-aura.setup = function () {
-  console.log("{{NAME}} started");
-};
+function resolveInvocationCwd(): string {
+  const forwardedCwd = process.env.AURA_INVOKE_CWD;
+  if (forwardedCwd && path.isAbsolute(forwardedCwd)) {
+    return forwardedCwd;
+  }
 
-aura.update = function (dt) {
-  if (aura.input.isKeyDown("arrowright")) x += speed * dt;
-  if (aura.input.isKeyDown("arrowleft"))  x -= speed * dt;
-  if (aura.input.isKeyDown("arrowup"))    y -= speed * dt;
-  if (aura.input.isKeyDown("arrowdown"))  y += speed * dt;
+  const shellPwd = process.env.PWD;
+  if (shellPwd && path.isAbsolute(shellPwd)) {
+    return shellPwd;
+  }
+  return process.cwd();
+}
 
-  const { width, height } = aura.window.getSize();
-  x = aura.math.clamp(x, 0, width);
-  y = aura.math.clamp(y, 0, height);
-};
+async function resolveGameName(initialName: string | null): Promise<string> {
+  if (initialName && initialName.trim().length > 0) {
+    return initialName.trim();
+  }
 
-aura.draw = function () {
-  aura.draw2d.clear(aura.rgba(0.08, 0.08, 0.12, 1.0));
-  aura.draw2d.rect(x - 16, y - 16, 32, 32, aura.rgb(0.39, 0.78, 1.0));
+  while (true) {
+    const answer = await promptInput('  Game name / folder');
+    if (answer) return answer;
+    console.error('  Game name is required.');
+  }
+}
 
-  const fps = aura.window.getFPS().toFixed(0);
-  aura.draw2d.text(
-    \`Arrow keys: move | FPS \${fps}\`,
-    10, 10,
-    { color: aura.Color.WHITE, size: 16, align: "left" }
-  );
-};
-`;
-
-const PLAY_JS_TEMPLATE = `#!/usr/bin/env node
-
-import { spawnSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
-import { resolve, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const projectRoot = resolve(__dirname, '..');
-const localAuraCli = resolve(projectRoot, 'node_modules', '@auraindustry', 'aurajs', 'src', 'cli.mjs');
-
-const result = existsSync(localAuraCli)
-  ? spawnSync(process.execPath, [localAuraCli, 'run'], {
-      cwd: projectRoot,
-      stdio: 'inherit',
-      env: process.env,
-    })
-  : spawnSync('npm', ['exec', '--yes', '--package', '@auraindustry/aurajs', '--', 'aura', 'run'], {
-      cwd: projectRoot,
-      stdio: 'inherit',
-      env: process.env,
-    });
-
-process.exit(result.status ?? 1);
-`;
-
-function template(str: string, vars: Record<string, string>): string {
-  let out = str;
-  for (const [key, value] of Object.entries(vars)) {
-    out = out.replaceAll(`{{${key}}}`, value);
+async function resolveTemplate(initialTemplate: string | null): Promise<string> {
+  const normalized = normalizeTemplate(initialTemplate);
+  if (normalized && VALID_TEMPLATES.has(normalized)) {
+    return normalized;
+  }
+
+  if (normalized && !VALID_TEMPLATES.has(normalized)) {
+    console.log(`  Unknown template "${normalized}"; choose one below.`);
   }
-  return out;
+
+  return promptSelect('  Starter template', TEMPLATE_OPTIONS, '2d-shooter');
 }
 
 async function main() {
-  const argv = process.argv.slice(2);
-  if (argv.includes('--help') || argv.includes('-h')) {
+  const parsed = parseArgs(process.argv.slice(2));
+
+  if (parsed.help) {
     printBanner('CREATE');
-    console.log(`  ${paint('Usage:', ANSI.bold)} auramaxx create`);
+    console.log(`  ${paint('Usage:', ANSI.bold)} auramaxx create [name] [--template <2d-shooter|3d-platformer|blank>] [--skip-install]`);
     console.log('');
-    console.log('  Scaffolds a new AuraJS game project ready for npm publish.');
+    console.log('  Styled wrapper around AuraJS create scaffolding.');
+    console.log(`  ${paint('Example:', ANSI.dim)} auramaxx create my-game --template 3d-platformer`);
     console.log('');
     return;
   }
 
   printBanner('CREATE');
-  printSection('New AuraJS Game', 'Answer a few questions to scaffold your project.');
-
-  // Check for existing package.json
-  const existingPkg = path.resolve('package.json');
-  let defaultName = '';
-  if (fs.existsSync(existingPkg)) {
-    try {
-      const pkg = JSON.parse(fs.readFileSync(existingPkg, 'utf-8'));
-      if (pkg.name) defaultName = pkg.name;
-    } catch {}
-  }
+  printSection('New AuraJS Game', 'AuraMaxx styling + prompts, delegated to AuraJS scaffolder.');
 
-  const name = (await promptInput(`  Package name${defaultName ? ` (${defaultName})` : ''}`)) || defaultName;
-  if (!name) {
-    console.error('  Package name is required.');
-    process.exit(1);
-  }
+  const name = await resolveGameName(parsed.name);
+  const template = await resolveTemplate(parsed.template);
+  const invocationCwd = resolveInvocationCwd();
 
-  const version = (await promptInput('  Version (0.0.1)')) || '0.0.1';
-
-  const license = await promptSelect(
-    '  License:',
-    [
-      { value: 'MIT', label: 'MIT', aliases: ['1'] },
-      { value: 'ISC', label: 'ISC', aliases: ['2'] },
-      { value: 'Apache-2.0', label: 'Apache-2.0', aliases: ['3'] },
-    ],
-    'MIT',
-  );
-
-  const projectDir = path.resolve(name);
-  if (fs.existsSync(projectDir) && fs.readdirSync(projectDir).length > 0) {
-    console.error(`  Directory "${name}" already exists and is not empty.`);
-    process.exit(1);
-  }
+  printSection('Scaffolding', `Delegating to AuraJS (${template})...`);
+
+  const auraArgs = ['create', name, '--template', template, ...parsed.passthrough];
 
-  printSection('Scaffolding', `Creating ${name}...`);
-
-  const vars = { NAME: name };
-
-  // Create directory structure
-  fs.mkdirSync(path.join(projectDir, 'src'), { recursive: true });
-  fs.mkdirSync(path.join(projectDir, 'bin'), { recursive: true });
-  fs.mkdirSync(path.join(projectDir, 'assets'), { recursive: true });
-
-  // package.json
-  const pkg = {
-    name,
-    version,
-    description: `${name} — built with AuraJS`,
-    type: 'module',
-    bin: { [name]: './bin/play.js' },
-    files: ['bin/', 'src/', 'assets/', 'aura.config.json'],
-    scripts: {
-      dev: 'npm exec --yes --package @auraindustry/aurajs -- aura dev',
-      build: 'npm exec --yes --package @auraindustry/aurajs -- aura build',
-      play: 'npm exec --yes --package @auraindustry/aurajs -- aura run',
-      publish: 'npm publish --access public',
-    },
-    dependencies: { '@auraindustry/aurajs': '*' },
-    keywords: ['aurajs', 'game'],
-    license,
-  };
-  fs.writeFileSync(path.join(projectDir, 'package.json'), JSON.stringify(pkg, null, 2) + '\n');
-
-  // aura.config.json
-  const config = JSON.parse(template(JSON.stringify(AURA_CONFIG_TEMPLATE), vars));
-  fs.writeFileSync(path.join(projectDir, 'aura.config.json'), JSON.stringify(config, null, 2) + '\n');
-
-  // src/main.js
-  fs.writeFileSync(path.join(projectDir, 'src', 'main.js'), template(MAIN_JS_TEMPLATE, vars));
-
-  // bin/play.js
-  fs.writeFileSync(path.join(projectDir, 'bin', 'play.js'), PLAY_JS_TEMPLATE, { mode: 0o755 });
-
-  // Install deps
-  printSection('Installing', 'Running npm install...');
   try {
-    execFileSync('npm', ['install'], {
-      cwd: projectDir,
-      stdio: 'inherit',
-      timeout: 120000,
-    });
-  } catch {
-    console.log('  npm install failed. Run it manually in the project directory.');
+    if (existsSync(LOCAL_AURAJS_CLI)) {
+      execFileSync(process.execPath, [LOCAL_AURAJS_CLI, ...auraArgs], {
+        cwd: invocationCwd,
+        stdio: 'inherit',
+        env: process.env,
+      });
+    } else {
+      execFileSync(
+        'npm',
+        ['exec', '--yes', '--package', '@auraindustry/aurajs', '--', 'aura', ...auraArgs],
+        {
+          cwd: invocationCwd,
+          stdio: 'inherit',
+          env: process.env,
+        },
+      );
+    }
+  } catch (error: unknown) {
+    const status = (error as { status?: number }).status;
+    if (status) process.exit(status);
+    throw error;
   }
-
-  printComplete(`${name} created.`);
-  console.log(`    ${paint('cd ' + name, ANSI.fgAccent)}`);
-  console.log(`    ${paint('npm run dev', ANSI.fgAccent)}           ${paint('# dev mode with hot-reload', ANSI.dim)}`);
-  console.log(`    ${paint('npm run play', ANSI.fgAccent)}          ${paint('# build and run', ANSI.dim)}`);
-  console.log(`    ${paint('npm publish', ANSI.fgAccent)}           ${paint('# publish to npm', ANSI.dim)}`);
-  console.log(`    ${paint('auramaxx play ' + name, ANSI.fgAccent)} ${paint('# anyone can play it', ANSI.dim)}`);
-  console.log('');
 }
 
 main().catch((err) => {

package/src/server/cli/commands/onboard.ts

@@ -1,7 +1,12 @@
 import { execFileSync } from 'child_process';
+import path from 'path';
+import { fileURLToPath } from 'url';
 import { printBanner, printComplete, paint, ANSI } from '../lib/theme';
 import { promptSelect } from '../lib/prompt';
 
+const COMMAND_DIR = path.dirname(fileURLToPath(import.meta.url));
+const CREATE_COMMAND_PATH = path.join(COMMAND_DIR, 'create.ts');
+
 async function main() {
   printBanner();
 
@@ -28,9 +33,20 @@ async function main() {
     process.exit((error as { status?: number }).status || 1);
   }
 
-  printComplete('auramaxx installed. Get started with:');
-  console.log(`    ${paint('auramaxx start', ANSI.fgAccent)}`);
+  printComplete('auramaxx installed. Launching AuraJS create...');
+  console.log(`    ${paint('auramaxx create my-game', ANSI.fgAccent)}`);
   console.log('');
+
+  try {
+    execFileSync(process.execPath, ['--import', 'tsx', CREATE_COMMAND_PATH], {
+      stdio: 'inherit',
+      env: process.env,
+    });
+  } catch (error: unknown) {
+    console.error('');
+    console.error('  Create flow failed. Try manually: auramaxx create my-game');
+    process.exit((error as { status?: number }).status || 1);
+  }
 }
 
 main().catch((err) => {