@auraindustry/aurajs 0.0.7 → 0.1.1

package/src/bundler.mjs

@@ -9,7 +9,9 @@ import {
   readdirSync,
   watch,
 } from 'node:fs';
-import { dirname, join, normalize, relative, resolve, sep } from 'node:path';
+import { dirname, isAbsolute, join, normalize, relative, resolve, sep } from 'node:path';
+import { buildGameActionRuntimeBootstrapSource } from './game-action-runtime.mjs';
+import { buildStateRestoreRuntimeBootstrapSource } from './game-state-runtime.mjs';
 
 export const BUNDLE_ERROR_CODES = {
   MISSING_ENTRY: 'AURA_MOD_001',
@@ -30,6 +32,16 @@ class BundleError extends Error {
   }
 }
 
+const AUTHORED_SOURCE_ROOT_DIRS = Object.freeze([
+  'src',
+  'scenes',
+  'ui',
+  'prefabs',
+  'config',
+  'content',
+  'data',
+]);
+
 export function isBundleError(error) {
   return error instanceof BundleError;
 }
@@ -123,16 +135,12 @@ export function bundleProject(options = {}) {
     );
   }
 
-  const entryRel = relative(srcDir, entryFile);
-  if (entryRel.startsWith('..')) {
-    throw new BundleError(
-      BUNDLE_ERROR_CODES.PATH_ESCAPE,
-      'Entrypoint must be inside src/.',
-      { file: entryFile },
-    );
-  }
-
-  const graph = buildModuleGraph({ srcDir, entryFile, cache });
+  const graph = inspectProjectModuleGraph({
+    projectRoot,
+    entryFile,
+    cache,
+    moduleRoot: srcDir,
+  });
   const bundleText = emitBundle(graph);
   const bundleHash = sha1(bundleText);
 
@@ -158,6 +166,37 @@ export function bundleProject(options = {}) {
   };
 }
 
+export function inspectProjectModuleGraph(options = {}) {
+  const projectRoot = resolve(options.projectRoot || process.cwd());
+  const cache = options.cache || { files: new Map() };
+  const entryFile = options.entryFile
+    ? resolve(projectRoot, options.entryFile)
+    : resolve(projectRoot, 'src/main.js');
+  const moduleRoot = resolve(options.moduleRoot || resolve(projectRoot, 'src'));
+  const allowedSourceRoots = resolveAllowedSourceRoots(
+    projectRoot,
+    options.allowedSourceRoots || options.sourceRootDirs || null,
+  );
+
+  if (!existsSync(entryFile)) {
+    throw new BundleError(
+      BUNDLE_ERROR_CODES.MISSING_ENTRY,
+      `Missing entrypoint ${relPath(projectRoot, entryFile)}.`,
+      { file: entryFile },
+    );
+  }
+
+  ensureEntryWithinSource(projectRoot, allowedSourceRoots, entryFile);
+
+  return buildModuleGraph({
+    projectRoot,
+    srcDir: moduleRoot,
+    entryFile,
+    cache,
+    allowedSourceRoots,
+  });
+}
+
 function buildModuleGraph(ctx) {
   const state = new Map();
   const modules = new Map();
@@ -192,7 +231,13 @@ function buildModuleGraph(ctx) {
     const dependencies = [];
 
     for (const entry of parsed.imports) {
-      const resolved = resolveSpecifier(ctx.srcDir, filePath, entry);
+      const resolved = resolveSpecifier(
+        ctx.projectRoot,
+        ctx.allowedSourceRoots,
+        ctx.srcDir,
+        filePath,
+        entry,
+      );
       dependencies.push({ ...entry, resolved });
       visit(resolved, [...stack, filePath]);
     }
@@ -211,6 +256,8 @@ function buildModuleGraph(ctx) {
 
 function emitBundle(graph) {
   const lines = [];
+  const stateRuntimeBootstrap = buildStateRestoreRuntimeBootstrapSource();
+  const actionRuntimeBootstrap = buildGameActionRuntimeBootstrapSource();
   lines.push('// AuraJS bundle v1');
   lines.push('// Generated by AuraJS bundler (AS-043 semantics, AS-004 module rules)');
   lines.push('(function(){');
@@ -240,6 +287,9 @@ function emitBundle(graph) {
   lines.push('    return module.exports;');
   lines.push('  }');
   lines.push('');
+  lines.push(`  ${stateRuntimeBootstrap}`);
+  lines.push(`  ${actionRuntimeBootstrap}`);
+  lines.push('');
   lines.push(`  __require(${JSON.stringify(graph.entryId)});`);
   lines.push('})();');
   lines.push('');
@@ -249,8 +299,12 @@ function emitBundle(graph) {
 
 function transformModule(moduleMeta, srcDir) {
   const importByLine = new Map();
+  const importContinuationLines = new Set();
   for (const item of moduleMeta.imports) {
     importByLine.set(item.line, item);
+    for (let line = item.line + 1; line <= item.endLine; line += 1) {
+      importContinuationLines.add(line);
+    }
   }
 
   const out = [];
@@ -271,6 +325,10 @@ function transformModule(moduleMeta, srcDir) {
       continue;
     }
 
+    if (importContinuationLines.has(lineNo)) {
+      continue;
+    }
+
     const transformedExport = transformExportLine(source, lineNo, moduleMeta.filePath, exportAssignments);
     out.push(...transformedExport);
   }
@@ -464,31 +522,34 @@ function scanImports(code, filePath) {
     }
 
     const lineNo = idx + 1;
-    const sideEffect = trimmed.match(/^import\s+['"]([^'"\n]+)['"]\s*;?$/);
-    if (sideEffect) {
-      imports.push({
-        line: lineNo,
-        column: line.indexOf('import') + 1,
-        clause: null,
-        specifier: sideEffect[1],
-      });
-      continue;
+    let endIdx = idx;
+    let statement = line;
+    let parsed = parseImportStatement(statement);
+
+    while (!parsed && endIdx + 1 < lines.length) {
+      if (statement.trim().endsWith(';')) {
+        break;
+      }
+      endIdx += 1;
+      statement += `\n${lines[endIdx]}`;
+      parsed = parseImportStatement(statement);
     }
 
-    const fromImport = trimmed.match(/^import\s+(.+)\s+from\s+['"]([^'"\n]+)['"]\s*;?$/);
-    if (fromImport) {
+    if (parsed) {
       imports.push({
         line: lineNo,
         column: line.indexOf('import') + 1,
-        clause: fromImport[1].trim(),
-        specifier: fromImport[2],
+        endLine: endIdx + 1,
+        clause: parsed.clause,
+        specifier: parsed.specifier,
       });
+      idx = endIdx;
       continue;
     }
 
     throw new BundleError(
       BUNDLE_ERROR_CODES.SYNTAX_ERROR,
-      'Unsupported import syntax. Use single-line static imports.',
+      'Unsupported import syntax. Use static relative imports.',
       { file: filePath, line: lineNo },
     );
   }
@@ -496,7 +557,28 @@ function scanImports(code, filePath) {
   return imports;
 }
 
-function resolveSpecifier(srcDir, importer, importEntry) {
+function parseImportStatement(statement) {
+  const normalized = statement.replace(/\s+/g, ' ').trim();
+  const sideEffect = normalized.match(/^import\s+['"]([^'"\n]+)['"]\s*;?$/);
+  if (sideEffect) {
+    return {
+      clause: null,
+      specifier: sideEffect[1],
+    };
+  }
+
+  const fromImport = normalized.match(/^import\s+(.+?)\s+from\s+['"]([^'"\n]+)['"]\s*;?$/);
+  if (fromImport) {
+    return {
+      clause: fromImport[1].trim(),
+      specifier: fromImport[2],
+    };
+  }
+
+  return null;
+}
+
+function resolveSpecifier(projectRoot, allowedSourceRoots, srcDir, importer, importEntry) {
   const specifier = importEntry.specifier;
 
   if (!(specifier.startsWith('./') || specifier.startsWith('../'))) {
@@ -522,7 +604,7 @@ function resolveSpecifier(srcDir, importer, importEntry) {
   ];
 
   for (const candidate of candidates) {
-    ensureWithinSource(srcDir, candidate, importer, importEntry);
+    ensureWithinSource(projectRoot, allowedSourceRoots, candidate, importer, importEntry);
     if (existsSync(candidate) && statSync(candidate).isFile()) {
       return candidate;
     }
@@ -541,22 +623,59 @@ function resolveSpecifier(srcDir, importer, importEntry) {
   );
 }
 
-function ensureWithinSource(srcDir, candidate, importer, importEntry) {
-  const rel = relative(srcDir, candidate);
-  if (rel.startsWith('..') || rel === '' && candidate !== srcDir) {
-    if (rel.startsWith('..')) {
-      throw new BundleError(
-        BUNDLE_ERROR_CODES.PATH_ESCAPE,
-        `Import "${importEntry.specifier}" escapes the src/ directory boundary.`,
-        {
-          file: importer,
-          importer,
-          specifier: importEntry.specifier,
-          line: importEntry.line,
-        },
-      );
+function resolveAllowedSourceRoots(projectRoot, explicitRoots = null) {
+  if (Array.isArray(explicitRoots) && explicitRoots.length > 0) {
+    return explicitRoots
+      .map((value) => resolve(projectRoot, value))
+      .filter((root) => existsSync(root));
+  }
+
+  const roots = [];
+  for (const dir of AUTHORED_SOURCE_ROOT_DIRS) {
+    const root = resolve(projectRoot, dir);
+    if (existsSync(root)) {
+      roots.push(root);
     }
   }
+  return roots;
+}
+
+function ensureEntryWithinSource(projectRoot, allowedSourceRoots, entryFile) {
+  if (allowedSourceRoots.some((root) => pathIsWithinRoot(root, entryFile))) {
+    return;
+  }
+
+  throw new BundleError(
+    BUNDLE_ERROR_CODES.PATH_ESCAPE,
+    'Entrypoint must stay within the authored source boundary.',
+    {
+      file: entryFile,
+      candidates: allowedSourceRoots.map((root) => relPath(projectRoot, root)),
+    },
+  );
+}
+
+function pathIsWithinRoot(root, candidate) {
+  const rel = relative(root, candidate);
+  return rel === '' || (!rel.startsWith('..') && !isAbsolute(rel));
+}
+
+function ensureWithinSource(projectRoot, allowedSourceRoots, candidate, importer, importEntry) {
+  if (allowedSourceRoots.some((root) => pathIsWithinRoot(root, candidate))) {
+    return;
+  }
+
+  throw new BundleError(
+    BUNDLE_ERROR_CODES.PATH_ESCAPE,
+    `Import "${importEntry.specifier}" escapes the authored source boundary.`,
+    {
+      file: importer,
+      importer,
+      specifier: importEntry.specifier,
+      line: importEntry.line,
+      candidates: allowedSourceRoots.map((root) => relPath(projectRoot, root)),
+    },
+  );
 }
 
 function moduleId(srcDir, filePath) {
@@ -634,12 +753,12 @@ function stopSourceWatch(cache) {
 function startSourceWatch(projectRoot, cache, onChange, onError) {
   stopSourceWatch(cache);
 
-  const srcDir = resolve(projectRoot, 'src');
+  const sourceRoots = resolveAllowedSourceRoots(projectRoot);
   let closed = false;
 
-  if (!existsSync(srcDir)) {
+  if (sourceRoots.length === 0) {
     throw new BundleError(BUNDLE_ERROR_CODES.MISSING_ENTRY, 'Missing src/ directory for dev watch.', {
-      file: srcDir,
+      file: resolve(projectRoot, 'src'),
     });
   }
 
@@ -650,19 +769,22 @@ function startSourceWatch(projectRoot, cache, onChange, onError) {
   };
 
   try {
-    const watcher = watch(srcDir, { recursive: true }, (_eventType, filename) => {
-      if (!filename) return;
-      if (!String(filename).endsWith('.js') && !String(filename).endsWith('.mjs')) return;
-      onChange(filename);
-    });
-    cache.watchers.push(watcher);
+    for (const root of sourceRoots) {
+      const watcher = watch(root, { recursive: true }, (_eventType, filename) => {
+        if (!filename) return;
+        if (isGeneratedSourceFile(filename)) return;
+        if (!String(filename).endsWith('.js') && !String(filename).endsWith('.mjs')) return;
+        onChange(join(root, String(filename)));
+      });
+      cache.watchers.push(watcher);
+    }
     return close;
   } catch (_err) {
     // Fallback for platforms that do not support recursive fs.watch.
-    cache.pollFingerprint = fingerprintSourceTree(srcDir);
+    cache.pollFingerprint = fingerprintSourceRoots(sourceRoots);
     cache.poller = setInterval(() => {
       try {
-        const next = fingerprintSourceTree(srcDir);
+        const next = fingerprintSourceRoots(sourceRoots);
         if (next !== cache.pollFingerprint) {
           cache.pollFingerprint = next;
           onChange('poll');
@@ -675,9 +797,11 @@ function startSourceWatch(projectRoot, cache, onChange, onError) {
   }
 }
 
-function fingerprintSourceTree(rootDir) {
+function fingerprintSourceRoots(rootDirs) {
   const files = [];
-  walk(rootDir, files);
+  for (const rootDir of rootDirs) {
+    walk(rootDir, files);
+  }
   files.sort();
   return sha1(files.join('\n'));
 }
@@ -687,6 +811,9 @@ function walk(dir, output) {
     const full = join(dir, entry);
     const stat = statSync(full);
     if (stat.isDirectory()) {
+      if (entry === '.aurajs-generated') {
+        continue;
+      }
       walk(full, output);
       continue;
     }
@@ -696,3 +823,9 @@ function walk(dir, output) {
     output.push(`${full}:${stat.mtimeMs}:${stat.size}`);
   }
 }
+
+function isGeneratedSourceFile(filename) {
+  const normalized = String(filename || '').split('\\').join('/');
+  return normalized === '.aurajs-generated'
+    || normalized.startsWith('.aurajs-generated/');
+}