fix(ecs): fix tests

Author: Exeloo

packages/core/src/application/nanoforge-application.ts

@@ -1,11 +1,11 @@
 import {
+  ApplicationContext,
   type IAssetManagerLibrary,
   type IComponentSystemLibrary,
   type ILibrary,
   type INetworkLibrary,
   type IRunOptions,
 } from "@nanoforge/common";
-import { ApplicationContext } from "@nanoforge/common/src/context/contexts/application.context";
 
 import { Core } from "../core/core";
 import { ApplicationConfig } from "./application-config";

packages/ecs/.gitignore

@@ -268,5 +268,7 @@ src/**/*.d.ts
 
 # pubilc directory
 lib/libecs.wasm
+lib/index.d.ts
+lib/index.js
 compile_commands.json
 emsdk/

packages/ecs/Makefile

@@ -52,15 +52,14 @@ $(TS_NAME): $(OBJ)
 
 clean:
 	$(RM) $(OBJ)
-	$(RM) -r $(OUT_DIR)
 	$(RM) $(JS_NAME) $(WASM_NAME) $(HTML_NAME) $(TS_NAME)
 
 fclean: clean
 
-tests: LDFLAGS += -s MODULARIZE=1 -s STANDALONE_WASM=1
+tests: LDFLAGS += -s MODULARIZE=1
 tests: $(OBJ)
 	@mkdir -p $(OUT_DIR)
-	$(CC) $(OBJ) $(LDFLAGS) -o $(JS_NAME)
+	$(CC) $(OBJ) $(LDFLAGS) --emit-tsd $(TS_NAME) -o $(JS_NAME)
 
 re: fclean all
 

packages/ecs/lib/index.ts

@@ -1,4 +1,2 @@
-import "libecs.wasm";
-
 export * from "./libecs";
 export { default as Module } from "./libecs";

packages/ecs/lib/libecs.js

@@ -1,6 +1,6 @@
 var Module = (() => {
-  var _scriptName = import.meta.url;
-  
+  var _scriptName = typeof document != 'undefined' ? document.currentScript?.src : undefined;
+  if (typeof __filename != 'undefined') _scriptName = _scriptName || __filename;
   return (
 async function(moduleArg = {}) {
   var moduleRtn;
@@ -40,11 +40,6 @@ var ENVIRONMENT_IS_NODE = typeof process == 'object' && typeof process.versions
 var ENVIRONMENT_IS_SHELL = !ENVIRONMENT_IS_WEB && !ENVIRONMENT_IS_NODE && !ENVIRONMENT_IS_WORKER;
 
 if (ENVIRONMENT_IS_NODE) {
-  // When building an ES module `require` is not normally available.
-  // We need to use `createRequire()` to construct the require()` function.
-  const { createRequire } = await import('module');
-  /** @suppress{duplicate} */
-  var require = createRequire(import.meta.url);
 
 }
 
@@ -93,12 +88,7 @@ if (ENVIRONMENT_IS_NODE) {
   var fs = require('fs');
   var nodePath = require('path');
 
-  // EXPORT_ES6 + ENVIRONMENT_IS_NODE always requires use of import.meta.url,
-  // since there's no way getting the current absolute path of the module when
-  // support for that is not available.
-  if (!import.meta.url.startsWith('data:')) {
-    scriptDirectory = nodePath.dirname(require('url').fileURLToPath(import.meta.url)) + '/';
-  }
+  scriptDirectory = __dirname + '/';
 
 // include: node_shell_read.js
 readBinary = (filename) => {
@@ -445,15 +435,13 @@ function isExportedByForceFilesystem(name) {
  * their build, or no symbols that no longer exist.
  */
 function hookGlobalSymbolAccess(sym, func) {
-  if (typeof globalThis != 'undefined' && !Object.getOwnPropertyDescriptor(globalThis, sym)) {
-    Object.defineProperty(globalThis, sym, {
-      configurable: true,
-      get() {
-        func();
-        return undefined;
-      }
-    });
-  }
+  // In MODULARIZE mode the generated code runs inside a function scope and not
+  // the global scope, and JavaScript does not provide access to function scopes
+  // so we cannot dynamically modify the scrope using `defineProperty` in this
+  // case.
+  //
+  // In this mode we simply ignore requests for `hookGlobalSymbolAccess`. Since
+  // this is a debug-only feature, skipping it is not major issue.
 }
 
 function missingGlobal(sym, msg) {
@@ -721,11 +709,7 @@ function createExportWrapper(name, nargs) {
 
 var wasmBinaryFile;
 function findWasmBinary() {
-  if (Module['locateFile']) {
     return locateFile('libecs.wasm');
-  }
-  // Use bundler-friendly `new URL(..., import.meta.url)` pattern; works in browsers too.
-  return new URL('libecs.wasm', import.meta.url).href;
 }
 
 function getBinarySync(file) {
@@ -3826,4 +3810,10 @@ for (const prop of Object.keys(Module)) {
     return real_Module(arg);
   }
 })();
-export default Module;
+if (typeof exports === 'object' && typeof module === 'object') {
+  module.exports = Module;
+  // This default export looks redundant, but it allows TS to import this
+  // commonjs style module.
+  module.exports.default = Module;
+} else if (typeof define === 'function' && define['amd'])
+  define([], () => Module);

packages/ecs/package.json

@@ -34,7 +34,7 @@
     "fix": "eslint . --fix && prettier --write .",
     "taze": "taze major -w",
     "lint-staged": "lint-staged",
-    "test:unit": "make fclean && make tests -j 16 && jest --config ./jest.config.json"
+    "test:unit": "make fclean && make tests -j 16 && pnpm clean:script && pnpm build:script && jest --config ./jest.config.json"
   },
   "dependencies": {
     "@nanoforge/common": "workspace:^"

packages/ecs/src/ecs-library.ts

@@ -1,22 +1,23 @@
-import { type Entity, type MainModule, Module, type Registry, type SparseArray } from "@lib";
 import { type AssetManagerLibrary } from "@nanoforge/asset-manager";
 import { BaseComponentSystemLibrary, type InitContext } from "@nanoforge/common";
 
+import { type Entity, type MainModule, Module, type Registry, type SparseArray } from "../lib";
+
 export class ECSLibrary extends BaseComponentSystemLibrary {
-  name: string = "ECSLibrary";
-  module: MainModule;
-  registry: Registry;
-  path: string = "libecs.wasm";
+  private module: MainModule;
+  private registry: Registry;
+  private readonly path: string = "libecs.wasm";
+
+  get name(): string {
+    return "ECSLibrary";
+  }
 
   async init(context: InitContext): Promise<void> {
     const wasmFile = await context.libraries
       .getAssetManager<AssetManagerLibrary>()
       .library.getWasm(this.path);
-    Module({ locateFile: () => wasmFile.path }).then((module) => {
-      this.module = module;
-      this.registry = new module.Registry();
-      return Promise.resolve();
-    });
+    this.module = await Module({ locateFile: () => wasmFile.path });
+    this.registry = new this.module.Registry();
   }
 
   async run(): Promise<void> {

packages/ecs/src/index.ts

@@ -0,0 +1,3 @@
+import "../lib/libecs.wasm";
+
+export * from "./ecs-library";

packages/ecs/test/ecs-library.spec.ts

@@ -1,4 +1,7 @@
-import { ECSLibrary } from "../src/ecs-library";
+import { AssetManagerLibrary } from "@nanoforge/asset-manager";
+import { ApplicationContext, InitContext } from "@nanoforge/common";
+import { EditableLibraryManager } from "@nanoforge/core/src/common/library/manager/library.manager";
+import { ECSLibrary } from "@nanoforge/ecs/src/ecs-library";
 
 class Position {
   constructor(
@@ -11,17 +14,37 @@ class Position {
 }
 
 describe("ECSLibrary", () => {
+  let ecs: ECSLibrary;
+  const assetManager = new AssetManagerLibrary();
+  const appContext = new ApplicationContext();
+  const libraryManager = new EditableLibraryManager();
+  const context = new InitContext(appContext, libraryManager, {
+    // @ts-ignore
+    canvas: null,
+    files: {
+      assets: new Map(),
+      wasm: new Map([["/libecs.wasm", "./lib/libecs.wasm"]]),
+      wgsl: new Map(),
+    },
+  });
+  libraryManager.setAssetManager(assetManager);
+
+  beforeAll(async () => {
+    await assetManager.init(context);
+  });
+
+  beforeEach(async () => {
+    ecs = new ECSLibrary();
+    await ecs.init(context);
+  });
+
   test("init and spawn entity", async () => {
-    const ecs = new ECSLibrary("public");
-    await ecs.init();
     const entity = ecs.createEntity();
     expect(entity).toBeDefined();
     expect(entity.get_id()).toBe(0);
   });
 
   test("add component to entity", async () => {
-    const ecs = new ECSLibrary("public/");
-    await ecs.init();
     const entity = ecs.createEntity();
     const pos = new Position(1, 2);
     ecs.addComponent(entity, pos);
@@ -31,8 +54,6 @@ describe("ECSLibrary", () => {
   });
 
   test("clear", async () => {
-    const ecs = new ECSLibrary("public/");
-    await ecs.init();
     await ecs.clear();
   });
 });

packages/ecs/test/tsconfig.json

@@ -1,3 +1,14 @@
 {
-  "extends": "../../../tsconfig.spec.json"
+  "extends": "../../../tsconfig.spec.json",
+  "compilerOptions": {
+    "paths": {
+      "@nanoforge/common": ["./packages/common"],
+      "@nanoforge/core": ["./packages/core"],
+      "@nanoforge/core/*": ["./packages/core/*"],
+      "@nanoforge/asset-manager": ["./packages/asset-manager"],
+      "@nanoforge/ecs": ["./packages/ecs"],
+      "@nanoforge/ecs/*": ["./packages/ecs/*"],
+      "@nanoforge/graphics-2d": ["./packages/graphics-2d"]
+    }
+  }
 }