@divizend/scratch-core 1.0.0 → 1.0.2

package/basic/index.ts

@@ -347,7 +347,9 @@ class BasicParser {
     this.statements.push(
       `${" ".repeat(
         this.indent
-      )}context.result = await context.universe!.call(context, "${endpointName}"${argsStr ? `, ${argsStr}` : ""});`
+      )}context.result = await context.universe!.call(context, "${endpointName}"${
+        argsStr ? `, ${argsStr}` : ""
+      });`
     );
   }
 }
@@ -488,3 +490,6 @@ export function compileBasicToTypeScript(
   const compiler = new BasicCompiler();
   return compiler.compile(basicCode, opcode);
 }
+
+// Export DEFAULT_BASIC_DEMO from demo.ts
+export { DEFAULT_BASIC_DEMO } from "./demo";

package/core/ProjectRoot.ts

@@ -28,7 +28,16 @@ export async function getProjectRoot(): Promise<string> {
   const __dirname = dirname(__filename);
 
   // Start from the current file's directory and walk up
+  // If we're in node_modules, walk up to the actual project root
   let currentDir = resolve(__dirname);
+  
+  // If we're in node_modules/@divizend/scratch-core, walk up to the workspace root
+  if (currentDir.includes("node_modules/@divizend/scratch-core")) {
+    // Walk up from node_modules/@divizend/scratch-core to the workspace root
+    while (currentDir.includes("node_modules") && currentDir !== dirname(currentDir)) {
+      currentDir = dirname(currentDir);
+    }
+  }
 
   // Marker files that indicate project root
   const markers = ["package.json", "tsconfig.json"];

package/core/Universe.ts

@@ -24,7 +24,7 @@ import {
 } from "..";
 import { Auth } from "./Auth";
 import { HttpServer } from "../http-server";
-import { NativeHttpServer } from "../http-server/NativeHttpServer";
+import { ExpressHttpServer } from "../http-server/ExpressHttpServer";
 import { ScratchContext, ScratchBlock } from "./Scratch";
 import { resolve, join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -76,10 +76,8 @@ export class Universe {
    */
   static async construct({
     gsuite: initGSuite = true,
-    endpointsDirectory,
   }: {
     gsuite?: boolean;
-    endpointsDirectory?: string;
   } = {}): Promise<Universe> {
     const universe = new Universe();
 
@@ -187,36 +185,31 @@ export class Universe {
     universe.emailQueue = new EmailQueue(profiles);
 
     // Initialize HTTP server
-    universe.httpServer = new NativeHttpServer(universe);
-
+    universe.httpServer = new ExpressHttpServer(universe);
+    
+    // Initialize default endpoints (loadEndpoints, loadEndpointsUI) - BEFORE static files
+    await universe.httpServer.initializeDefaultEndpoints();
+    
     // Get project root for static files
     const { getProjectRoot } = await import("./ProjectRoot");
     const projectRoot = await getProjectRoot();
 
-    // Register static files
+    // Register static files - AFTER endpoints so endpoints take precedence
     universe.httpServer.registerStaticFiles(projectRoot);
 
-    // Load and register endpoints (if directory is provided)
-    if (endpointsDirectory) {
-      const endpointsDir = resolve(endpointsDirectory);
-      await universe.httpServer.loadEndpointsFromDirectory(endpointsDir);
-    }
-
-    // Log all registered endpoints (if endpoints were loaded)
-    if (endpointsDirectory) {
-      const endpointInfos = await universe.httpServer.getRegisteredEndpoints();
-      console.log("\n📋 Registered Scratch Endpoints:");
-      console.log("=".repeat(50));
-      endpointInfos.forEach((info) => {
-        console.log(
-          `  ${info.method.padEnd(4)} ${info.endpoint.padEnd(30)} ${
-            info.blockType
-          }${info.auth}`
-        );
-      });
-      console.log("=".repeat(50));
-      console.log(`Total: ${endpointInfos.length} endpoints\n`);
-    }
+    // Log all registered endpoints
+    const endpointInfos = await universe.httpServer.getRegisteredEndpoints();
+    console.log("\n📋 Registered Scratch Endpoints:");
+    console.log("=".repeat(50));
+    endpointInfos.forEach((info) => {
+      console.log(
+        `  ${info.method.padEnd(4)} ${info.endpoint.padEnd(30)} ${
+          info.blockType
+        }${info.auth}`
+      );
+    });
+    console.log("=".repeat(50));
+    console.log(`Total: ${endpointInfos.length} endpoints\n`);
 
     // Start the server (skip if running in Bun, as Bun handles server lifecycle)
     if (typeof Bun === "undefined") {