Execute PHP files on require from JS-land immediately and add new Environment API

Author: asmblah

.github/workflows/main.yml

@@ -8,7 +8,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [14.x, 16.x, 18.x, 19.x]
+                node-version: [18.x, 20.x, 22.x]
 
         steps:
             # Check out the repository under $GITHUB_WORKSPACE, so this job can access it.

api/async.js

@@ -11,8 +11,11 @@
 
 /*global global */
 var API = require('../src/API'),
-    EnvironmentProvider = require('../src/EnvironmentProvider'),
+    Environment = require('../src/Environment/Environment'),
+    EnvironmentFactory = require('../src/Environment/EnvironmentFactory'),
+    EnvironmentProvider = require('../src/Environment/EnvironmentProvider'),
     FileSystem = require('../src/FileSystem'),
+    InitialiserContext = require('../src/Initialiser/InitialiserContext'),
     IO = require('../src/IO'),
     Loader = require('../src/Loader'),
     ModuleRepository = require('../src/ModuleRepository'),
@@ -21,8 +24,19 @@ var API = require('../src/API'),
     phpConfigImporter = require('phpconfig').configImporter,
     phpRuntime = require('phpruntime'),
     io = new IO(console),
-    environmentProvider = new EnvironmentProvider(phpRuntime, performance, io),
-    api = new API(FileSystem, Loader, ModuleRepository, environmentProvider, phpConfigImporter, require.cache),
+    environmentFactory = new EnvironmentFactory(Environment),
+    environmentProvider = new EnvironmentProvider(environmentFactory, phpRuntime, performance, io),
+    initialiserLoader = require('../src/shared/initialiserLoader'),
+    api = new API(
+        FileSystem,
+        Loader,
+        ModuleRepository,
+        InitialiserContext,
+        environmentProvider,
+        initialiserLoader,
+        phpConfigImporter,
+        require.cache
+    ),
     loader = api.createLoader();
 
 module.exports = loader;

api/psync.js

@@ -11,8 +11,11 @@
 
 /*global global */
 var API = require('../src/API'),
-    EnvironmentProvider = require('../src/EnvironmentProvider'),
+    Environment = require('../src/Environment/Environment'),
+    EnvironmentFactory = require('../src/Environment/EnvironmentFactory'),
+    EnvironmentProvider = require('../src/Environment/EnvironmentProvider'),
     FileSystem = require('../src/FileSystem'),
+    InitialiserContext = require('../src/Initialiser/InitialiserContext'),
     IO = require('../src/IO'),
     Loader = require('../src/Loader'),
     ModuleRepository = require('../src/ModuleRepository'),
@@ -21,8 +24,19 @@ var API = require('../src/API'),
     phpConfigImporter = require('phpconfig').configImporter,
     phpRuntime = require('phpruntime/psync'),
     io = new IO(console),
-    environmentProvider = new EnvironmentProvider(phpRuntime, performance, io),
-    api = new API(FileSystem, Loader, ModuleRepository, environmentProvider, phpConfigImporter, require.cache),
+    environmentFactory = new EnvironmentFactory(Environment),
+    environmentProvider = new EnvironmentProvider(environmentFactory, phpRuntime, performance, io),
+    initialiserLoader = require('../src/shared/initialiserLoader'),
+    api = new API(
+        FileSystem,
+        Loader,
+        ModuleRepository,
+        InitialiserContext,
+        environmentProvider,
+        initialiserLoader,
+        phpConfigImporter,
+        require.cache
+    ),
     loader = api.createLoader();
 
 module.exports = loader;

api/sync.js

@@ -11,8 +11,11 @@
 
 /*global global */
 var API = require('../src/API'),
-    EnvironmentProvider = require('../src/EnvironmentProvider'),
+    Environment = require('../src/Environment/Environment'),
+    EnvironmentFactory = require('../src/Environment/EnvironmentFactory'),
+    EnvironmentProvider = require('../src/Environment/EnvironmentProvider'),
     FileSystem = require('../src/FileSystem'),
+    InitialiserContext = require('../src/Initialiser/InitialiserContext'),
     IO = require('../src/IO'),
     Loader = require('../src/Loader'),
     ModuleRepository = require('../src/ModuleRepository'),
@@ -21,8 +24,19 @@ var API = require('../src/API'),
     phpConfigImporter = require('phpconfig').configImporter,
     phpRuntime = require('phpruntime/sync'),
     io = new IO(console),
-    environmentProvider = new EnvironmentProvider(phpRuntime, performance, io),
-    api = new API(FileSystem, Loader, ModuleRepository, environmentProvider, phpConfigImporter, require.cache),
+    environmentFactory = new EnvironmentFactory(Environment),
+    environmentProvider = new EnvironmentProvider(environmentFactory, phpRuntime, performance, io),
+    initialiserLoader = require('../src/shared/initialiserLoader'),
+    api = new API(
+        FileSystem,
+        Loader,
+        ModuleRepository,
+        InitialiserContext,
+        environmentProvider,
+        initialiserLoader,
+        phpConfigImporter,
+        require.cache
+    ),
     loader = api.createLoader();
 
 module.exports = loader;