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

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

@@ -5,36 +5,24 @@ const fsp = require('node:fs/promises');
 const vm = require('node:vm');
 const { isService, loadService } = require('./service.js');
 
-const chronology = ['before.js', 'after.js'];
-const isChronological = (filePath) =>
-  chronology.some((file) => filePath.endsWith(file));
-const orderFiles = (files) => {
-  const before = files.find(({ name }) => name === 'before.js');
-  const after = files.find(({ name }) => name === 'after.js');
-  const ordered = files.filter(({ name }) => !chronology.includes(name));
-  ordered.sort();
-  if (before !== undefined) ordered.unshift(before);
-  if (after !== undefined) ordered.push(after);
-  return ordered;
-};
-
 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);
-  const sandbox = { ...context };
+  const sandbox = { ...context, module: container };
   const result = await script.runInContext(vm.createContext(sandbox));
-  if (isChronological(filePath)) return void (await result());
+  if (result === undefined) return;
   for (const [method, definition] of Object.entries(result)) {
     if (isService(definition, context)) {
       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) => {
@@ -49,8 +37,7 @@ const loadDir = async (context, container, dirPath, key) => {
     else directories.push(entry);
   }
 
-  const orderedFiles = orderFiles(files);
-  for (const { name } of orderedFiles) {
+  for (const { name } of files) {
     if (!name.endsWith('.js')) continue;
     const location = path.join(dirPath, name);
     let basename = path.basename(name, '.js');
@@ -59,9 +46,10 @@ const loadDir = async (context, container, dirPath, key) => {
     else await loadFile(context, nextContainer, location, basename);
   }
 
-  for (const { name } of directories) {
+  for (let { name } of directories) {
     const location = path.join(dirPath, name);
-    if (name === '>') await loadDir(context, container, location, key);
+    name = removeIndex(name);
+    if (name === 'methods') await loadDir(context, container, location, key);
     else await loadDir(context, nextContainer, location, name);
   }
 };

package/package.json

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

package/test/application/chestnut/chestnut.js

@@ -0,0 +1,6 @@
+'use strict';
+
+({
+  age: 0,
+  isRipe: () => self.age === 1,
+});

package/test/application/chestnut/methods/grow.js

@@ -0,0 +1,3 @@
+'use strict';
+
+() => module.age++;

package/test/test.js

@@ -0,0 +1,18 @@
+'use strict';
+
+const test = require('node:test');
+const assert = require('node:assert');
+const vm = require('node:vm');
+const path = require('node:path');
+const { loadDir } = require('../lib/loader');
+
+const PATH_TO_APPLICATION = path.join(__dirname, 'application');
+
+test('Methods', async () => {
+  const context = vm.createContext({});
+  await loadDir(context, context, PATH_TO_APPLICATION);
+  const chestnut = context.application.chestnut;
+  assert.strictEqual(chestnut.isRipe(), false);
+  chestnut.grow();
+  assert.strictEqual(chestnut.isRipe(), true);
+});

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 };