@geastack/core 0.1.29 → 0.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geastack/core",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "GeaStack app API, reactivity headers, runtime sources, and type declarations.",
   "license": "Apache-2.0",
   "repository": {
@@ -62,8 +62,8 @@
     "@babel/types": "^7.23.0",
     "@geajs/core": "1.5.1",
     "@geajs/vite-plugin": "1.5.0",
-    "@geastack/compiler": "^1.0.19",
-    "@geastack/geatsc-plugin-gea": "^0.1.9",
+    "@geastack/compiler": "^1.0.20",
+    "@geastack/geatsc-plugin-gea": "^0.1.13",
     "opentype.js": "^2.0.0",
     "vite": "^8.0.0"
   }

package/runtime.cpp

@@ -57,8 +57,8 @@ namespace {
 void run_app_frame(int timestampMs, void *context)
 {
 	(void)context;
-	events::TouchRuntime::poll(timestampMs);
-	services::BatteryService::poll(timestampMs);
+	// Canvas-only inference excludes input/battery consumers. These services
+	// belong to the full runtime and are not linked in the reduced source set.
 	app::Application::frame(timestampMs);
 }
 
@@ -363,6 +363,16 @@ bool Runtime::boot(const RuntimeOptions &options)
 		// correctly in PSRAM the whole time. Display::init() now claims its floor
 		// before this line, and this bring-up shrinks it the designed way.
 		services::DiagnosticsServer::print("Starting WiFi after display init\n");
+		// This synchronous boot path bypasses WifiStation::ensureBringUp(),
+		// which normally yields display staging before allocating the radio.
+		// No frame task is running yet, so apply the reservation here rather
+		// than waiting for a frame that cannot run until init() returns.
+		// Keep the already-secured minimum pipeline, yielding the rest before
+		// both radio and application audio allocations. A fixed 56 KiB shrink
+		// left a 52 KiB staging pool on this boot path and starved I2S DMA.
+		gea::platform::display::Display::reserveInternal(
+		    static_cast<std::size_t>(gea::platform::display::Display::flushBufferBytes()));
+		gea::platform::display::Display::applyPendingInternalReserve();
 		network::wifi().init();
 	}
 #endif
@@ -406,6 +416,14 @@ bool Runtime::boot(const RuntimeOptions &options)
 	services::HeapProbe::log("runtime:after_frame_start");
 	services::StackProbe::logCurrentTask("runtime:after_frame_start");
 	services::HeapTaskSummary::log("runtime:after_frame_start");
+#if GEA_EMBEDDED_WIFI_EARLY_CONNECT
+	// The early-connect loan protects radio, app, and task initialization.
+	// They now own their allocations; let the frame task grow staging into
+	// the remaining heap instead of retaining the two-row boot floor forever.
+	// Allocation still observes the DMA reserve and falls back when RAM is tight.
+	if (GEA_EMBEDDED_WIFI_SSID[0] != '\0')
+		gea::platform::display::Display::reserveInternal(0);
+#endif
 	services::RuntimeLog::appStarted(networkReady);
 #endif
 

package/scripts/build-gea-vite-geatsc.mjs

@@ -6,8 +6,9 @@ import { spawnSync } from 'node:child_process'
 import { createRequire } from 'node:module'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 import { inlineJsonImports, transformGeaEmbeddedCompatSource } from './gea-embedded-compat-transform.mjs'
-import { shouldIgnoreCompatStagingDirectory } from './gea-embedded-compat-staging.mjs'
+import { normalizeEmbeddedJsxOptions, shouldIgnoreCompatStagingDirectory } from './gea-embedded-compat-staging.mjs'
 import { dotEnvDefines, inlineProcessEnv } from './dotenv-defines.mjs'
+import { resolveCompilerRuntimeEntry } from './gea-native-style-plugin.mjs'
 import {
   MODULE_HINT_SCOPE,
   applyBundledTypeHints,
@@ -75,9 +76,17 @@ const { parse } = requireFromLib('@babel/parser')
 const traverseModule = requireFromLib('@babel/traverse')
 const t = requireFromLib('@babel/types')
 const traverse = traverseModule.default || traverseModule
-const useStaticCssRules = !['0', 'false', 'no'].includes(String(process.env.GEA_STATIC_CSS_RULES ?? '1').toLowerCase())
-const useStaticCssTape = !['0', 'false', 'no'].includes(String(process.env.GEA_STATIC_CSS_TAPE ?? '1').toLowerCase())
-const staticCssTapeMinChunk = Math.max(1, Number.parseInt(process.env.GEA_STATIC_CSS_TAPE_MIN_CHUNK ?? '5', 10) || 1)
+const buildConfigPath = readOption('--build-config') ?? process.env.GEA_BUILD_CONFIG_JSON
+const nativeBuildSettings = buildConfigPath
+  ? JSON.parse(fs.readFileSync(path.resolve(buildConfigPath), 'utf8')).settings || {}
+  : {}
+const compilerSettings = nativeBuildSettings.compiler || {}
+for (const name of ['GEA_STATIC_CSS_RULES', 'GEA_STATIC_CSS_TAPE', 'GEA_STATIC_CSS_TAPE_MIN_CHUNK', 'GEA_CPP_TRANSLATION_UNITS', 'GEA_PER_FILE_UNITS', 'GEA_SKIP_STORE_RELOWER', 'GEA_EMBEDDED_DIRECT_CANVAS_CONTEXT', 'GEA_EMBEDDED_NUMBER_F32']) {
+  if (process.env[name] !== undefined) fail(`${name} is no longer a build override; declare compiler settings in package.json and build through gea`)
+}
+const useStaticCssRules = compilerSettings.staticCssRules ?? true
+const useStaticCssTape = compilerSettings.staticCssTape ?? true
+const staticCssTapeMinChunk = compilerSettings.staticCssTapeMinChunk ?? 5
 
 function readOption(name) {
   const index = args.indexOf(name)
@@ -360,6 +369,7 @@ function stateRuntimeAliasToTypeScript(stagedAppDir, compatSrcDir, stagingRoot)
     }
   }
   const options = config.compilerOptions ?? (config.compilerOptions = {})
+  normalizeEmbeddedJsxOptions(options)
   options.baseUrl = options.baseUrl ?? '.'
   const base = path.resolve(stagedAppDir, options.baseUrl)
   // Both specifiers, because the Vite config aliases both to the same
@@ -458,23 +468,8 @@ function writeCompatViteConfig({ configPath, compatSrcDir, appDir, entry, viteOu
   // whole reactive runtime dynamically (gea_cpp_value, ill-formed auto-vectors,
   // proxy derefs). From source, everything is typed and lowers natively, exactly
   // like three.js/hono/mongodb. The env var still wins when explicitly set;
-  // otherwise resolve the package's source entry via its node_modules symlink.
-  let compilerRuntimeEntry = process.env.GEA_COMPILER_RUNTIME_SOURCE || ''
-  if (!compilerRuntimeEntry) {
-    for (const base of [appDir, coreRoot]) {
-      try {
-        const pkgDir = fs.realpathSync(path.join(base, 'node_modules/@geajs/core'))
-        const srcIndex = path.join(pkgDir, 'src/index.ts')
-        if (fs.existsSync(srcIndex) && fs.existsSync(path.join(pkgDir, 'src/compiler-runtime.ts'))) {
-          compilerRuntimeEntry = srcIndex
-          break
-        }
-      } catch {
-        // No @geajs/core source under this base (e.g. published-only install) —
-        // fall through; the alias stays empty and the dist runtime is used.
-      }
-    }
-  }
+  // otherwise follow ordinary package resolution, including hoisted installs.
+  const compilerRuntimeEntry = process.env.GEA_COMPILER_RUNTIME_SOURCE || resolveCompilerRuntimeEntry([appDir, coreRoot])
   const compilerRuntimeAlias = compilerRuntimeEntry && fs.existsSync(compilerRuntimeEntry)
     ? `      { find: new RegExp('^@geajs/core$'), replacement: ${q(compilerRuntimeEntry)} },\n`
     : ''
@@ -4275,11 +4270,14 @@ const viteBin = path.resolve(readOption('--vite-bin') ?? path.join(path.dirname(
 const viteOutDir = path.resolve(readOption('--vite-out-dir') ?? path.join(outDir, 'dist'))
 const bundlePath = path.resolve(readOption('--bundle-out') ?? path.join(outDir, 'gea-vite-bundle.js'))
 const geaIrPath = path.resolve(readOption('--gea-ir-out') ?? path.join(viteOutDir, 'gea-ir.json'))
-const moduleGraphOutOption = readOption('--module-graph-out') ?? process.env.GEA_VITE_MODULE_GRAPH_OUT
-const moduleGraphOnly = hasFlag('--module-graph-only')
-const moduleGraphCompileRequested = hasFlag('--compile-module-graph')
-const moduleGraphCompileDisabled = hasFlag('--no-compile-module-graph')
-const geaPluginSpecifier = path.resolve(readOption('--geatsc-gea-plugin') ?? requireFromLib.resolve('@geastack/geatsc-plugin-gea'))
+const moduleGraphOutOption = readOption('--module-graph-out') ?? (compilerSettings.moduleGraph === 'only' || compilerSettings.moduleGraph === 'compile' ? path.join(outDir, 'module-graph') : undefined) ?? process.env.GEA_VITE_MODULE_GRAPH_OUT
+const moduleGraphOnly = hasFlag('--module-graph-only') || compilerSettings.moduleGraph === 'only'
+const moduleGraphCompileRequested = hasFlag('--compile-module-graph') || compilerSettings.moduleGraph === 'compile'
+const moduleGraphCompileDisabled = hasFlag('--no-compile-module-graph') || compilerSettings.moduleGraph === 'disabled'
+const geaPluginSpecifier = path.resolve(
+  readOption('--geatsc-gea-plugin') ??
+  (process.env.GEA_PLUGIN_DIR ? path.join(process.env.GEA_PLUGIN_DIR, 'dist/index.js') : undefined) ??
+  requireFromLib.resolve('@geastack/geatsc-plugin-gea'))
 const extraGeatscPlugins = readAllOptions('--extra-geatsc-plugin').map((plugin) => path.resolve(plugin))
 const appendJsFiles = readAllOptions('--append-js').map((file) => path.resolve(file))
 const entry = readOption('--entry') ?? 'index.tsx'
@@ -4568,21 +4566,17 @@ if (cppPreludeSymbol) geatscArgs.push('--plugin-option', `gea.cpp-prelude-symbol
 if (pixelPanelEndian) geatscArgs.push('--plugin-option', `gea.pixel-panel-endian=${pixelPanelEndian}`)
 if (cppBoard) geatscArgs.push('--cpp-board', cppBoard)
 if (cxxStandard) geatscArgs.push('--cxx-standard', cxxStandard)
-if (hasFlag('--allow-any')) geatscArgs.push('--allow-any')
+if (hasFlag('--allow-any') || compilerSettings.allowAny) geatscArgs.push('--allow-any')
 if (entrySymbol) geatscArgs.push('--entry-symbol', entrySymbol)
 if (hasFlag('--isolate-symbols')) geatscArgs.push('--isolate-symbols')
 // One C++ unit per source module plus a shared header, instead of one unit for
 // the whole program. Every target already reads `geatsc-sources.txt` as a LIST,
 // so nothing downstream changes; see the compiler's docs/TRANSLATION-UNITS.md
 // for what it buys (parallel and incremental C++ builds) and what it costs.
-// The env var is honored beside the flag so a target need not plumb one: every
-// build in the tree goes through this script, and the boards' CMakeLists spell
-// their geatsc command line by hand, so an env var reaches all of them at once
-// (`GEA_PER_FILE_UNITS=1 <any build>`). build-macos.sh sets the flag itself and
-// folds the variable into its freshness signature, because a layout change
-// invalidates every generated file.
-if (process.env.GEA_CPP_TRANSLATION_UNITS === 'balanced') geatscArgs.push('--translation-units', 'balanced')
-else if (hasFlag('--per-file-units') || process.env.GEA_PER_FILE_UNITS === '1') geatscArgs.push('--translation-units', 'per-file')
+const translationUnits = readOption('--translation-units') ?? compilerSettings.translationUnits
+if (translationUnits === 'balanced') geatscArgs.push('--translation-units', 'balanced')
+else if (hasFlag('--per-file-units') || translationUnits === 'per-file') geatscArgs.push('--translation-units', 'per-file')
+geatscArgs.push('--plugin-option', `gea.store-relowering=${compilerSettings.storeRelowering !== false}`)
 if (hasFlag('--gea-ir-backend') || hasFlag('--gea-replace-renderers')) {
   geatscArgs.push('--plugin-option', 'gea.replace-renderers=true')
 }

package/scripts/gea-embedded-compat-staging.mjs

@@ -15,3 +15,11 @@ const ignoredDirectorySet = new Set(COMPAT_STAGING_IGNORED_DIRECTORIES)
 export function shouldIgnoreCompatStagingDirectory(name) {
   return ignoredDirectorySet.has(name)
 }
+
+// The browser JSX runtime declares Element as `any`. Embedded components are
+// lowered through @geastack/core's typed global JSX namespace instead. Match
+// the Component/Store import conversion without altering custom JSX providers
+// or the application's original web tsconfig.
+export function normalizeEmbeddedJsxOptions(options) {
+  if (options.jsxImportSource === '@geajs/core') delete options.jsxImportSource
+}

package/scripts/gea-embedded-compat-transform.mjs

@@ -151,7 +151,7 @@ function normalizeRuntimeCoreImports(ast) {
   const movedSpecs = []
 
   for (const node of ast.program.body) {
-    if (!t.isImportDeclaration(node) || node.source.value !== '@geastack/core') {
+    if (!t.isImportDeclaration(node) || !['@geastack/core', '@geajs/core'].includes(node.source.value)) {
       nextBody.push(node)
       continue
     }
@@ -213,7 +213,7 @@ function transformTopLevelStatement(stmt) {
 }
 
 export function transformGeaEmbeddedCompatSource(code, filename) {
-  if ((!code.includes('<') || !code.includes('>')) && !code.includes('@geastack/core')) return code
+  if ((!code.includes('<') || !code.includes('>')) && !code.includes('@geastack/core') && !code.includes('@geajs/core')) return code
 
   const ast = parser.parse(code, {
     sourceType: 'module',

package/scripts/gea-native-style-plugin.mjs

@@ -1,5 +1,23 @@
 import fs from 'node:fs'
 import path from 'node:path'
+import { createRequire } from 'node:module'
+
+// Follow Node's node_modules search chain, including hoisted workspace installs.
+// package.json need not be exposed by the package's exports map.
+export function resolveCompilerRuntimeEntry(bases) {
+  for (const base of bases) {
+    const require = createRequire(path.join(path.resolve(base), 'package.json'))
+    for (const modules of require.resolve.paths('@geajs/core') || []) {
+      const source = path.join(modules, '@geajs/core/src')
+      const entry = path.join(source, 'index.ts')
+      if (fs.existsSync(entry) && fs.existsSync(path.join(source, 'compiler-runtime.ts')))
+        return fs.realpathSync(entry)
+      // An installed package shadows ancestors, even if it lacks typed sources.
+      if (fs.existsSync(path.join(modules, '@geajs/core/package.json'))) break
+    }
+  }
+  return ''
+}
 
 /** Native lengths are raw numbers; only an authored CSS unit may introduce scaling. */
 export function geaNativeStylePlugin({ runtimeEntry }) {