@geastack/core 0.1.44 → 0.1.45

package/gea_app_entry.cpp

@@ -29,8 +29,17 @@ namespace gea::framework::app::generated {
 void drainMicrotasks();
 }  // namespace gea::framework::app::generated
 
-extern "C" void gea_cycle_collection_defer_begin() __attribute__((weak));
-extern "C" void gea_cycle_collection_defer_end() __attribute__((weak));
+// Optional hooks a generated program defines weakly. A COFF linker cannot pair
+// a weak reference with a weak definition (each names its own default), so a
+// target that links a default for every such hook (lld-link /alternatename)
+// sets GEA_LINKED_HOOK_DEFAULTS and the references become ordinary ones.
+#if defined(GEA_LINKED_HOOK_DEFAULTS) && GEA_LINKED_HOOK_DEFAULTS
+#define GEA_PROGRAM_HOOK
+#else
+#define GEA_PROGRAM_HOOK __attribute__((weak))
+#endif
+extern "C" void gea_cycle_collection_defer_begin() GEA_PROGRAM_HOOK;
+extern "C" void gea_cycle_collection_defer_end() GEA_PROGRAM_HOOK;
 extern "C" bool gea_embedded_assets_prepare() __attribute__((weak));
 
 namespace gea::framework::app {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geastack/core",
-  "version": "0.1.44",
+  "version": "0.1.45",
   "description": "GeaStack app API, reactivity headers, runtime sources, and type declarations.",
   "license": "Apache-2.0",
   "repository": {

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

@@ -110,6 +110,12 @@ function readAllOptions(name) {
   return values.filter(Boolean)
 }
 
+// The app's own Vite config: any of the names Vite itself looks for.
+function appViteConfig(dir) {
+  const names = ['vite.config.ts', 'vite.config.mts', 'vite.config.mjs', 'vite.config.js']
+  return names.map((name) => path.join(dir, name)).find((file) => fs.existsSync(file)) ?? path.join(dir, names[0])
+}
+
 function fail(message) {
   process.stderr.write(`${message}\n`)
   process.exit(1)
@@ -4479,7 +4485,7 @@ const moduleGraphOutDir = moduleGraphOutOption
     : ''
 let viteConfig = geaEmbeddedCompat
   ? path.join(outDir, 'gea-embedded-compat.vite.config.mjs')
-  : path.resolve(readOption('--vite-config') ?? path.join(appDir, 'vite.config.ts'))
+  : path.resolve(readOption('--vite-config') ?? appViteConfig(appDir))
 const appleNativePluginSpecifier = path.resolve(readOption('--geatsc-apple-native-plugin') ?? tryResolve('@geastack/geatsc-plugin-apple-native'))
 
 if (!geaEmbeddedCompat && !fs.existsSync(viteConfig)) fail(`missing Vite config: ${viteConfig}`)
@@ -4675,6 +4681,15 @@ const geatscArgs = [
   `gea.native-signature-host-root=${process.env.GEA_HOST_DIR || path.resolve(coreRoot, '..', 'host')}`,
 ]
 if (!moduleGraphCompile) geatscArgs.push('--target', 'cpp')
+// --project <tsconfig.json>: the TypeScript project the program means. Without
+// it the compiler reads modules under the project nearest its input, which for
+// an app whose sources live outside its package can be another package's
+// (resolving a type-only import to a different copy of a library).
+const projectOption = readOption('--project')
+if (projectOption) {
+  if (!fs.existsSync(projectOption)) fail(`--project names a missing TypeScript project: ${projectOption}`)
+  geatscArgs.push('--project', path.resolve(projectOption))
+}
 if (moduleGraphCompile) {
   geatscArgs.push('--entry', stagedEntryFile ?? path.join(appDir, entry), '--module-graph-stage', 'hybrid')
 }
@@ -4711,9 +4726,20 @@ if (hasFlag('--gea-ir-backend') || hasFlag('--gea-replace-renderers')) {
 // measurement scripts are always run with this
 // limit; the build has to state the same one, not depend on the caller's
 // NODE_OPTIONS.
+// GEA_GEATSC_MAX_OLD_SPACE_SIZE (MiB) lowers or raises that limit for a
+// machine with less memory to spare; a heap the analysis outgrows then fails
+// the build instead of exhausting the machine.
 // Native interface call graphs can exceed V8's default ~1 MiB stack during
 // closure analysis; keep the compiler stack below the host's 8 MiB limit.
-run('node', ['--stack_size=8192', '--max-old-space-size=32768', ...geatscArgs])
+const geatscHeapMiB = (() => {
+  const stated = process.env.GEA_GEATSC_MAX_OLD_SPACE_SIZE
+  if (stated === undefined || stated === '') return 32768
+  const value = Number(stated)
+  if (!Number.isInteger(value) || value < 512) fail(`GEA_GEATSC_MAX_OLD_SPACE_SIZE must be a whole number of MiB (at least 512): ${stated}`)
+  return value
+})()
+const geatscNodeArgs = ['--stack_size=8192', `--max-old-space-size=${geatscHeapMiB}`]
+run('node', [...geatscNodeArgs, ...geatscArgs])
 
 if (nativeModules.size) {
   const nativeSources = []
@@ -4736,7 +4762,7 @@ if (nativeModules.size) {
     ]
     if (cppBoard) moduleArgs.push('--cpp-board', cppBoard)
     if (cxxStandard) moduleArgs.push('--cxx-standard', cxxStandard)
-    run('node', ['--stack_size=8192', '--max-old-space-size=32768', ...moduleArgs])
+    run('node', [...geatscNodeArgs, ...moduleArgs])
     const list = fs.readFileSync(path.join(moduleOut, 'geatsc-sources.txt'), 'utf8').split(/\r?\n/).filter(Boolean)
     nativeSources.push(...list.filter((source) => path.basename(source) !== 'gea_runtime_builtins.cpp'))
   }

package/scripts/gea-vite-module-graph-plugin.mjs

@@ -91,7 +91,10 @@ export function geaThreeModuleAliases(options = {}) {
 }
 
 export function geaModuleGraphPlugins(options = {}) {
-  const outDir = options.outDir || process.env.GEA_VITE_MODULE_GRAPH_OUT || ''
+  // A build driver (build-gea-vite-geatsc.mjs) states where it reads the graph
+  // through GEA_VITE_MODULE_GRAPH_OUT; that wins over the location an app's own
+  // Vite config names for its standalone runs.
+  const outDir = process.env.GEA_VITE_MODULE_GRAPH_OUT || options.outDir || ''
   if (!outDir) return []
 
   const state = {