@geastack/cli 0.1.2 → 0.1.4

package/README.md

@@ -9,16 +9,17 @@ keeping target-specific build logic behind stable backend contracts.
 ## Commands
 
 ```sh
-npx @geastack/create-geastack my-panel
+npm install --global @geastack/cli
+gea create my-panel
 cd my-panel
-npx gea doctor
-npx gea setup
-npx gea dev
-npx gea build --target web
-npx gea build --target ios
-npx gea flash --board amoled --monitor
-npx gea monitor --board amoled
-npx gea inspect --json
+gea doctor
+gea setup
+gea dev
+gea build --target web
+gea build --target ios
+gea flash --board amoled --monitor
+gea monitor --board amoled
+gea inspect --json
 ```
 
 ## Interactive Menu Map

package/docs/SPEC.md

@@ -154,7 +154,6 @@ Core fields:
     "id": "bouncing-balls-jsx",
     "name": "Balls JSX",
     "entry": "index.tsx",
-    "runtime": "gea",
     "targets": {
       "web": true,
       "esp32": true,
@@ -171,7 +170,7 @@ Validation rules:
 
 - `id` is required and should be stable.
 - `entry` is required and must exist.
-- `runtime` defaults to `gea` when omitted.
+- `runtime` defaults to `gea`; only non-Gea native applications should set it.
 - `targets` must be explicit for generated apps.
 - target backends may reject apps whose runtime or capabilities they do not
   support.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geastack/cli",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "type": "module",
   "description": "Command-line front door for GeaStack apps, targets, and local toolchains.",
   "publishConfig": {

package/src/create-geastack.mjs

@@ -38,13 +38,19 @@ export async function runCreateGeastack(argv, io = {}) {
   const ctx = createContext(parsed, env, cwd)
   const displayName = option(parsed, 'name', titleFromId(appId))
   const coreDependency = option(parsed, 'core-dependency') || '^0.1.4'
-  const cliDependency = option(parsed, 'cli-dependency') || '^0.1.2'
+  const cliDependency = option(parsed, 'cli-dependency') || '^0.1.4'
   const starter = await resolveStarter(ctx, parsed, io)
+  const entry = projectRelativePath(option(parsed, 'entry') || starter.starter?.entry || starter.example?.entry || 'index.tsx', 'entry')
+  if (option(parsed, 'entry') && starter.kind !== 'empty') {
+    fail('--entry can only be used with --starter empty.', ExitCode.usage)
+  }
 
   fs.mkdirSync(targetDir, { recursive: true })
   if (starter.kind === 'empty') {
-    fs.writeFileSync(path.join(targetDir, 'index.tsx'), indexTsx(displayName))
-    fs.writeFileSync(path.join(targetDir, 'styles.css'), stylesCss())
+    const entryPath = path.join(targetDir, entry)
+    fs.mkdirSync(path.dirname(entryPath), { recursive: true })
+    fs.writeFileSync(entryPath, indexTsx(displayName))
+    fs.writeFileSync(path.join(path.dirname(entryPath), 'styles.css'), stylesCss())
   } else if (starter.kind === 'bundled') {
     copyStarterFiles(starter.starter.root, targetDir)
   } else if (starter.kind === 'example') {
@@ -69,12 +75,14 @@ export async function runCreateGeastack(argv, io = {}) {
     appId,
     displayName,
     targets,
+    entry,
+    bleOta: flag(parsed, 'ble-ota'),
     coreDependency,
     cliDependency,
     sourcePackage,
     sourceManifest
   }))
-  ensureFile(path.join(targetDir, 'index.html'), () => indexHtml(displayName))
+  ensureFile(path.join(targetDir, 'index.html'), () => indexHtml(displayName, entry))
   fs.mkdirSync(path.join(targetDir, '.gea'), { recursive: true })
   writeJson(path.join(targetDir, '.gea', 'boards.json'), {})
   ensureJson(path.join(targetDir, 'tsconfig.json'), tsconfigJson)
@@ -203,7 +211,17 @@ function targetManifestFromObject(targets = {}) {
   }
 }
 
-function packageJson({ appId, displayName, targets, coreDependency, cliDependency, sourcePackage = {}, sourceManifest = {} }) {
+function packageJson({ appId, displayName, targets, entry, bleOta, coreDependency, cliDependency, sourcePackage = {}, sourceManifest = {} }) {
+  const geaManifest = {
+    ...sourceManifest,
+    id: appId,
+    name: displayName,
+    entry,
+    targets
+  }
+  if (bleOta) geaManifest.ota = { ...(geaManifest.ota || {}), ble: true }
+  if (!geaManifest.runtime || geaManifest.runtime === 'gea') delete geaManifest.runtime
+
   return {
     name: `gea-${appId}`,
     version: '0.1.0',
@@ -226,14 +244,7 @@ function packageJson({ appId, displayName, targets, coreDependency, cliDependenc
       typescript: sourcePackage.devDependencies?.typescript || 'latest',
       vite: sourcePackage.devDependencies?.vite || 'latest'
     },
-    gea: {
-      ...sourceManifest,
-      id: appId,
-      name: displayName,
-      entry: sourceManifest.entry || 'index.tsx',
-      runtime: sourceManifest.runtime || 'gea',
-      targets
-    },
+    gea: geaManifest,
     license: 'MIT'
   }
 }
@@ -297,7 +308,7 @@ h1 {
 `
 }
 
-function indexHtml(displayName) {
+function indexHtml(displayName, entry = 'index.tsx') {
   return `<!doctype html>
 <html lang="en">
   <head>
@@ -307,7 +318,7 @@ function indexHtml(displayName) {
   </head>
   <body>
     <div id="app"></div>
-    <script type="module" src="/index.tsx"></script>
+    <script type="module" src="/${entry}"></script>
   </body>
 </html>
 `
@@ -396,6 +407,14 @@ function normalizeStarter(value) {
   return normalized
 }
 
+function projectRelativePath(value, label) {
+  const normalized = path.posix.normalize(String(value || '').replaceAll('\\', '/')).replace(/^\.\//, '')
+  if (!normalized || normalized === '.' || normalized === '..' || normalized.startsWith('../') || path.posix.isAbsolute(normalized)) {
+    fail(`--${label} must be a path inside the project.`, ExitCode.usage)
+  }
+  return normalized
+}
+
 function readPackageJson(targetDir) {
   const packagePath = path.join(targetDir, 'package.json')
   if (!exists(packagePath)) return {}
@@ -420,6 +439,8 @@ Options:
   --examples-repo <git-url-or-local-path>
   --examples-ref <git-ref>
   --targets web,esp32,rp2350,geaos,macos,ios,android
+  --entry <relative-path>
+  --ble-ota
   --core-dependency <specifier>
   --cli-dependency <specifier>
   --install / --no-install

package/src/gea.mjs

@@ -1,6 +1,8 @@
 import path from 'node:path'
+import fs from 'node:fs'
 
 import { flag, option, parseArgs } from './args.mjs'
+import { runCreateGeastack } from './create-geastack.mjs'
 import { createChildEnv, createContext } from './context.mjs'
 import { ExitCode, fail } from './errors.mjs'
 import { exists, readJson } from './fs-utils.mjs'
@@ -18,7 +20,7 @@ import { runExternal } from './run.mjs'
 import { runSetupWizard } from './setup-wizard.mjs'
 import { commandVersion, nodeAtLeast } from './toolchain.mjs'
 
-const version = '0.1.1'
+const version = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version
 
 export async function runGea(argv, io = {}) {
   const parsed = parseArgs(argv)
@@ -35,6 +37,11 @@ export async function runGea(argv, io = {}) {
     stdout(version)
     return 0
   }
+  if (command === 'create') {
+    const createArgs = argv.slice(1)
+    if (option(parsed, 'install') === undefined) createArgs.push('--install')
+    return runCreateGeastack(createArgs, io)
+  }
   if (!command || command === 'help' || flag(parsed, 'help')) {
     stdout(usage())
     return 0
@@ -422,6 +429,7 @@ function requirePath(filePath, label) {
 
 function usage() {
   return `Usage:
+  gea create <name> [--starter counter|empty|example] [--targets <list>]
   gea doctor [--strict] [--json]
   gea setup --board <alias>
   gea dev [app] [--target web] [--port 5181]

package/starters/bundled/counter/package.json

@@ -20,7 +20,6 @@
     "name": "Counter",
     "description": "Minimal JSX counter with one tiny store.",
     "entry": "index.tsx",
-    "runtime": "gea",
     "targets": {
       "web": true,
       "esp32": true,

package/starters/catalog.json

@@ -7,7 +7,6 @@
       "description": "Minimal JSX counter with one tiny store.",
       "path": "bundled/counter",
       "entry": "index.tsx",
-      "runtime": "gea",
       "targets": {
         "web": true,
         "esp32": true,