@leonid-shutov/uncommonjs 1.0.0-alpha.0 → 1.0.0-alpha.1

package/lib/application.js

@@ -5,7 +5,7 @@ const path = require('node:path');
 const vm = require('node:vm');
 const errors = require('./errors.js');
 const { loadModules } = require('./deps.js');
-const { loadDir } = require('./loader.js');
+const { loadDir, loadFile } = require('./loader.js');
 
 const getDefaultApplicationPath = () => path.join(process.cwd(), 'application');
 
@@ -14,6 +14,11 @@ const readLayers = (applicationPath) =>
     .readFile(path.join(applicationPath, '.layers'), 'utf8')
     .then((data) => data.split(/[\r\n\s]+/).filter((s) => s.length !== 0));
 
+const loader = (context) => (layer) => {
+  if (layer.endsWith('.js')) return loadFile(context, context, layer);
+  else return loadDir(context, context, layer);
+};
+
 const loadApplication = async (sandbox = {}, options) => {
   Object.assign(sandbox, errors);
   const applicationPath = options?.path ?? getDefaultApplicationPath();
@@ -21,8 +26,9 @@ const loadApplication = async (sandbox = {}, options) => {
   const [modules, layers] = await Promise.all(promises);
   Object.assign(sandbox, modules);
   const context = vm.createContext(sandbox);
-  const load = loadDir.bind(undefined, context, context);
+  const load = loader(context);
   for (const layer of layers) await load(path.join(applicationPath, layer));
+  Object.assign(sandbox, { application: sandbox });
   return sandbox;
 };
 

package/lib/loader.js

@@ -21,6 +21,7 @@ const orderFiles = (files) => {
 const removeIndex = (key) => key.replace(/^\d+-/, '');
 
 const loadFile = async (context, container, filePath, key) => {
+  key ??= path.basename(filePath, '.js');
   const src = await fsp.readFile(filePath, 'utf8');
   const code = `'use strict';\n${src}`;
   const script = new vm.Script(code);
@@ -32,9 +33,9 @@ const loadFile = async (context, container, filePath, key) => {
       result[method] = loadService(definition, context);
     }
   }
-  sandbox.self = result;
   if (container[key] === undefined) container[key] = result;
   else Object.assign(container[key], result);
+  sandbox.self = container[key];
 };
 
 const loadDir = async (context, container, dirPath, key) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leonid-shutov/uncommonjs",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.1",
   "author": "Leonid Shutov <leonid.shutov.main@gmail.com>",
   "license": "MIT",
   "homepage": "https://github.com/leonid-shutov/uncommonjs#readme",

package/uncommon.js

@@ -1,7 +1,8 @@
 'use strict';
 
 const loader = require('./lib/loader.js');
+const application = require('./lib/application.js');
 const rest = require('./lib/rest.js');
 const errors = require('./lib/errors.js');
 
-module.exports = { ...loader, ...rest, ...errors };
+module.exports = { ...loader, ...application, ...rest, ...errors };