nesoi 3.2.9 → 3.3.1

package/lib/bundler/distributed/stages/1_mkdir_stage.d.ts

@@ -0,0 +1,15 @@
+import { DistributedApp } from '../distributed.app';
+import { DistributedBundler } from '../distributed.bundler';
+/**
+ * [Distributed Compiler Stage #1]
+ * Create the directory structure
+ *
+ * @category Distributed Compiler
+ * @subcategory Stages
+ */
+export declare class MkdirStage {
+    private bundler;
+    private app;
+    constructor(bundler: DistributedBundler, app: DistributedApp<any, any>);
+    run(): Promise<void>;
+}

package/lib/{compiler/apps → bundler}/distributed/stages/1_mkdir_stage.js

@@ -36,8 +36,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MkdirStage = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const space_1 = require("../../../../engine/space");
-const log_1 = require("../../../../engine/util/log");
+const space_1 = require("../../../engine/space");
+const log_1 = require("../../../engine/util/log");
 /**
  * [Distributed Compiler Stage #1]
  * Create the directory structure
@@ -46,14 +46,14 @@ const log_1 = require("../../../../engine/util/log");
  * @subcategory Stages
  */
 class MkdirStage {
-    constructor(distributed, app) {
-        this.distributed = distributed;
+    constructor(bundler, app) {
+        this.bundler = bundler;
         this.app = app;
     }
     async run() {
         log_1.Log.info('compiler', 'distributed', 'Creating build directory tree');
-        const dirs = this.distributed.dirs;
-        dirs.build = space_1.Space.path(this.distributed.compiler.space, 'build', this.app.name);
+        const dirs = this.bundler.dirs;
+        dirs.build = space_1.Space.path(this.bundler.compiler.space, 'build', this.app.name);
         // Remove build folder
         log_1.Log.debug('compiler', 'distributed', `Removing folder ${dirs.build}`);
         fs.rmSync(dirs.build, { recursive: true, force: true });

package/lib/bundler/distributed/stages/2_build_typescript_stage.d.ts

@@ -0,0 +1,15 @@
+import { DistributedApp } from '../distributed.app';
+import { DistributedBundler } from '../distributed.bundler';
+/**
+ * [Distributed Compiler Stage #2]
+ * Build typescript files to build folder
+ *
+ * @category Distributed Compiler
+ * @subcategory Stages
+ */
+export declare class BuildTypescriptStage {
+    private bundler;
+    private app;
+    constructor(bundler: DistributedBundler, app: DistributedApp<any, any>);
+    run(): Promise<void>;
+}

package/lib/{compiler/apps → bundler}/distributed/stages/2_build_typescript_stage.js

@@ -36,10 +36,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuildTypescriptStage = void 0;
 const ts = __importStar(require("typescript"));
 const path = __importStar(require("path"));
-const space_1 = require("../../../../engine/space");
-const log_1 = require("../../../../engine/util/log");
-const typescript_compiler_1 = require("../../../typescript/typescript_compiler");
-const app_1 = require("../../../../engine/apps/app");
+const space_1 = require("../../../engine/space");
+const log_1 = require("../../../engine/util/log");
+const typescript_compiler_1 = require("../../../compiler/typescript/typescript_compiler");
+const app_1 = require("../../../engine/app/app");
 /**
  * [Distributed Compiler Stage #2]
  * Build typescript files to build folder
@@ -48,12 +48,12 @@ const app_1 = require("../../../../engine/apps/app");
  * @subcategory Stages
  */
 class BuildTypescriptStage {
-    constructor(distributed, app) {
-        this.distributed = distributed;
+    constructor(bundler, app) {
+        this.bundler = bundler;
         this.app = app;
     }
     async run() {
-        const { config, compiler, dirs: _dirs, appPath } = this.distributed;
+        const { config, compiler, dirs: _dirs, appPath } = this.bundler;
         for (const name in this.app.nodes) {
             log_1.Log.info('compiler', 'distributed', `[${name}] Building TypeScript files...`);
             const node = this.app.nodes[name];

package/lib/bundler/distributed/stages/3_copy_types_stage.d.ts

@@ -0,0 +1,15 @@
+import { DistributedApp } from '../distributed.app';
+import { DistributedBundler } from '../distributed.bundler';
+/**
+ * [distributed Compiler Stage #3]
+ * Copy type declarations to build/types folder
+ *
+ * @category distributed Compiler
+ * @subcategory Stages
+ */
+export declare class CopyTypesStage {
+    private bundler;
+    private app;
+    constructor(bundler: DistributedBundler, app: DistributedApp<any, any>);
+    run(): Promise<void>;
+}

package/lib/{compiler/apps → bundler}/distributed/stages/3_copy_types_stage.js

@@ -36,10 +36,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyTypesStage = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const space_1 = require("../../../../engine/space");
-const log_1 = require("../../../../engine/util/log");
-const name_helpers_1 = require("../../../helpers/name_helpers");
-const app_1 = require("../../../../engine/apps/app");
+const space_1 = require("../../../engine/space");
+const log_1 = require("../../../engine/util/log");
+const name_helpers_1 = require("../../../engine/util/name_helpers");
+const app_1 = require("../../../engine/app/app");
 /**
  * [distributed Compiler Stage #3]
  * Copy type declarations to build/types folder
@@ -48,12 +48,12 @@ const app_1 = require("../../../../engine/apps/app");
  * @subcategory Stages
  */
 class CopyTypesStage {
-    constructor(distributed, app) {
-        this.distributed = distributed;
+    constructor(bundler, app) {
+        this.bundler = bundler;
         this.app = app;
     }
     async run() {
-        const { compiler, dirs: _dirs } = this.distributed;
+        const { compiler, dirs: _dirs } = this.bundler;
         for (const name in this.app.nodes) {
             log_1.Log.info('compiler', 'distributed', `[${name}] Copying module and space types from .nesoi to build/types folder...`);
             const node = this.app.nodes[name];

package/lib/bundler/distributed/stages/4_dump_modules_stage.d.ts

@@ -0,0 +1,16 @@
+import { DistributedBundler } from '../distributed.bundler';
+import { DistributedApp } from '../distributed.app';
+/**
+ * [distributed Compiler Stage #4]
+ * Dump modules to build/modules folder.
+ *
+ * @category distributed Compiler
+ * @subcategory Stages
+ */
+export declare class DumpModulesStage {
+    private bundler;
+    private app;
+    constructor(bundler: DistributedBundler, app: DistributedApp<any, any>);
+    run(): Promise<void>;
+    private dumpModule;
+}

package/lib/{compiler/apps → bundler}/distributed/stages/4_dump_modules_stage.js

@@ -36,8 +36,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DumpModulesStage = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const log_1 = require("../../../../engine/util/log");
-const app_1 = require("../../../../engine/apps/app");
+const log_1 = require("../../../engine/util/log");
+const app_1 = require("../../../engine/app/app");
 /**
  * [distributed Compiler Stage #4]
  * Dump modules to build/modules folder.
@@ -46,12 +46,12 @@ const app_1 = require("../../../../engine/apps/app");
  * @subcategory Stages
  */
 class DumpModulesStage {
-    constructor(distributed, app) {
-        this.distributed = distributed;
+    constructor(bundler, app) {
+        this.bundler = bundler;
         this.app = app;
     }
     async run() {
-        const { compiler, dirs: _dirs } = this.distributed;
+        const { compiler, dirs: _dirs } = this.bundler;
         for (const name in this.app.nodes) {
             log_1.Log.info('compiler', 'distributed', `[${name}] Dumping modules to build/modules folder...`);
             const node = this.app.nodes[name];

package/lib/{compiler/apps → bundler}/distributed/stages/5_copy_static_stage.js

@@ -2,8 +2,8 @@
 // import * as fs from 'fs';
 // import * as path from 'path';
 // import { Log } from '~/engine/util/log';
-// import { MonolythApp } from '~/engine/apps/monolyth/monolyth.app';
-// import { MonolythCompiler } from '../monolyth_compiler';
+// import { MonolythApp } from '~/bundler/monolyth/monolyth.app';
+// import { MonolythBundler } from '../monolyth.bundler';
 // import { Space } from '~/engine/space';
 // /**
 //  * [Monolyth Compiler Stage #5]
@@ -15,7 +15,7 @@
 //  */
 // export class CopyStaticStage {
 //     public constructor(
-//         private monolyth: MonolythCompiler,
+//         private monolyth: MonolythBundler,
 //         private app: MonolythApp<any, any>
 //     ) {}
 //     public async run() {

package/lib/{compiler/apps → bundler}/distributed/stages/6_dump_cli_stage.js

@@ -2,8 +2,8 @@
 // import * as fs from 'fs';
 // import * as path from 'path';
 // import { Log } from '~/engine/util/log';
-// import { MonolythApp } from '~/engine/apps/monolyth/monolyth.app';
-// import { MonolythCompiler } from '../monolyth_compiler';
+// import { MonolythApp } from '~/bundler/monolyth/monolyth.app';
+// import { MonolythBundler } from '../monolyth.bundler';
 // /**
 //  * [Monolyth Compiler Stage #6]
 //  * Dump the cli.js file to build/bin folder.
@@ -13,7 +13,7 @@
 //  */
 // export class DumpCLIStage {
 //     public constructor(
-//         private monolyth: MonolythCompiler,
+//         private monolyth: MonolythBundler,
 //         private app: MonolythApp<any, any>
 //     ) {}
 //     public async run() {

package/lib/{compiler/apps → bundler}/distributed/stages/7_dump_package_json_stage.js

@@ -2,9 +2,9 @@
 // import * as fs from 'fs';
 // import * as path from 'path';
 // import { Log } from '~/engine/util/log';
-// import { MonolythCompiler } from '../monolyth_compiler';
+// import { MonolythBundler } from '../monolyth.bundler';
 // import { Space } from '~/engine/space';
-// import { MonolythApp } from '~/engine/apps/monolyth/monolyth.app';
+// import { MonolythApp } from '~/bundler/monolyth/monolyth.app';
 // /**
 //  * [Monolyth Compiler Stage #7]
 //  * Dump the package.json file to build folder.
@@ -14,7 +14,7 @@
 //  */
 // export class DumpPackageJsonStage {
 //     public constructor(
-//         private monolyth: MonolythCompiler,
+//         private monolyth: MonolythBundler,
 //         private app: MonolythApp<any, any>
 //     ) {}
 //     public async run() {

package/lib/{engine/apps → bundler}/monolyth/monolyth.app.d.ts

@@ -1,11 +1,14 @@
-import { $Space, ModuleName } from "../../../schema";
-import { IService } from '../service';
-import { InlineApp } from './../inline.app';
-import { AnyTrxEngine } from '../../transaction/trx_engine';
-import { Space } from '../../space';
-import { Daemon } from "../../daemon";
-import { AppConfigBuilder } from '../app.config';
-import { AnyElementSchema } from "../../module";
+import { $Space, ModuleName } from "../../schema";
+import { Daemon } from "../../engine/daemon";
+import { AnyElementSchema } from "../../engine/module";
+import { Tag } from "../../engine/dependency";
+import { Compiler } from "../../compiler/compiler";
+import { MonolythBundlerConfig } from "./monolyth.bundler";
+import { AppConfigBuilder } from "../../engine/app/app.config";
+import { InlineApp } from "../../engine/app/inline.app";
+import { IService } from "../../engine/app/service";
+import { Space } from "../../engine/space";
+import { AnyTrxEngine } from "../../engine/transaction/trx_engine";
 /**
  * @category App
  * @subcategory Monolyth
@@ -14,6 +17,7 @@ export declare class MonolythApp<S extends $Space, ModuleNames extends string =
     private watcher?;
     constructor(name: string, space?: Space<S>);
     protected _packageJson?: Record<string, any>;
+    static bundle(compiler: Compiler, appPath: string, config?: MonolythBundlerConfig): Promise<void>;
     daemon($?: {
         watch?: boolean;
     }): Promise<Daemon<S, ModuleNames>>;
@@ -28,9 +32,5 @@ export declare class MonolythApp<S extends $Space, ModuleNames extends string =
  * @subcategory Monolyth
  */
 export declare class MonolythDaemon<S extends $Space, Modules extends ModuleName<S>> extends Daemon<S, Modules> {
-    protected getSchema(tag: {
-        module: Modules;
-        type: string;
-        name: string;
-    }): Promise<AnyElementSchema>;
+    protected getSchema(tag: Tag): Promise<AnyElementSchema>;
 }

package/lib/{engine/apps → bundler}/monolyth/monolyth.app.js

@@ -34,12 +34,13 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MonolythDaemon = exports.MonolythApp = void 0;
-const inline_app_1 = require("./../inline.app");
-const space_1 = require("../../space");
-const daemon_1 = require("../../daemon");
-const log_1 = require("../../util/log");
-const app_config_1 = require("../app.config");
-const dependency_1 = require("../../dependency");
+const daemon_1 = require("../../engine/daemon");
+const log_1 = require("../../engine/util/log");
+const dependency_1 = require("../../engine/dependency");
+const monolyth_bundler_1 = require("./monolyth.bundler");
+const app_config_1 = require("../../engine/app/app.config");
+const inline_app_1 = require("../../engine/app/inline.app");
+const space_1 = require("../../engine/space");
 /**
  * @category App
  * @subcategory Monolyth
@@ -50,6 +51,11 @@ class MonolythApp extends inline_app_1.InlineApp {
         this.builders = undefined;
         this.space = space;
     }
+    //
+    static bundle(compiler, appPath, config) {
+        return new monolyth_bundler_1.MonolythBundler(compiler, appPath, config)
+            .run();
+    }
     // Override InlineApp abstract methods
     async daemon($) {
         /**
@@ -114,10 +120,7 @@ class MonolythDaemon extends daemon_1.Daemon {
     async getSchema(tag) {
         const trxEngine = this.trxEngines[tag.module];
         const _module = trxEngine.getModule();
-        const schema = dependency_1.$Dependency.resolve(_module.schema, tag);
-        if (!schema) {
-            throw new Error(`Unable to reach schema '${tag}'`);
-        }
+        const schema = dependency_1.Tag.resolveFrom(tag, _module.schema);
         return Promise.resolve(schema);
     }
 }

package/lib/{compiler/apps/monolyth/monolyth_compiler.d.ts → bundler/monolyth/monolyth.bundler.d.ts}

@@ -1,23 +1,25 @@
-import { Compiler } from "../../compiler";
-import { AnyApp } from "../../../engine/apps/app";
-import { MonolythApp } from "../../../engine/apps/monolyth/monolyth.app";
-export type MonolythCompilerConfig = {
+import { Compiler } from "../../compiler/compiler";
+import { AnyApp } from "../../engine/app/app";
+import { MonolythApp } from "./monolyth.app";
+export type MonolythBundlerConfig = {
     libPaths?: string[];
     staticPaths?: string[];
     scripts?: Record<string, string>;
     nesoiPath?: string;
+    nesoiVersion?: string;
 };
-export declare class MonolythCompiler {
+export declare class MonolythBundler {
     compiler: Compiler;
     appPath: string;
-    config: MonolythCompilerConfig;
+    config: MonolythBundlerConfig;
+    tsconfig: Record<string, string | number>;
     dirs: {
         build: string;
         build_modules: string;
         build_types: string;
         build_bin: string;
     };
-    constructor(compiler: Compiler, appPath: string, config?: MonolythCompilerConfig);
+    constructor(compiler: Compiler, appPath: string, config?: MonolythBundlerConfig);
     run(): Promise<void>;
     mergeServicePaths(app: AnyApp): void;
     expandLibPaths(): void;

package/lib/{compiler/apps/monolyth/monolyth_compiler.js → bundler/monolyth/monolyth.bundler.js}

@@ -36,11 +36,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MonolythCompiler = void 0;
+exports.MonolythBundler = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const space_1 = require("../../../engine/space");
-const console_1 = __importDefault(require("../../../engine/util/console"));
+const space_1 = require("../../engine/space");
+const console_1 = __importDefault(require("../../engine/util/console"));
 const _1_mkdir_stage_1 = require("./stages/1_mkdir_stage");
 const _3_copy_types_stage_1 = require("./stages/3_copy_types_stage");
 const _4_dump_modules_stage_1 = require("./stages/4_dump_modules_stage");
@@ -48,20 +48,21 @@ const _5_copy_static_stage_1 = require("./stages/5_copy_static_stage");
 const _6_dump_cli_stage_1 = require("./stages/6_dump_cli_stage");
 const _7_dump_package_json_stage_1 = require("./stages/7_dump_package_json_stage");
 const _2_build_typescript_stage_1 = require("./stages/2_build_typescript_stage");
-const log_1 = require("../../../engine/util/log");
-const app_1 = require("../../../engine/apps/app");
-const monolyth_app_1 = require("../../../engine/apps/monolyth/monolyth.app");
-const path_1 = require("../../../engine/util/path");
-class MonolythCompiler {
+const log_1 = require("../../engine/util/log");
+const app_1 = require("../../engine/app/app");
+const monolyth_app_1 = require("./monolyth.app");
+const path_1 = require("../../engine/util/path");
+class MonolythBundler {
     constructor(compiler, appPath, config = {}) {
         this.compiler = compiler;
         this.appPath = appPath;
         this.config = config;
+        this.tsconfig = {};
         this.dirs = {};
     }
     async run() {
-        console_1.default.header('Monolyth Compiler');
-        log_1.Log.info('compiler', 'monolyth', `Importing the monolyth definition from ${this.appPath}`);
+        console_1.default.header('Monolyth Bundler');
+        log_1.Log.info('bundler', 'monolyth', `Importing the monolyth definition from ${this.appPath}`);
         const appFile = space_1.Space.path(this.compiler.space, this.appPath);
         const app = (await Promise.resolve(`${appFile}`).then(s => __importStar(require(s)))).default;
         this.config = Object.assign({}, app_1.App.getInfo(app).config?.compiler || {}, this.config);
@@ -77,7 +78,7 @@ class MonolythCompiler {
             await new _7_dump_package_json_stage_1.DumpPackageJsonStage(this, app).run();
         }
         catch (e) {
-            log_1.Log.error('compiler', 'monolyth', e.toString(), { stack: e.stack });
+            log_1.Log.error('bundler', 'monolyth', e.toString(), { stack: e.stack });
             process.exit(1);
         }
     }
@@ -118,4 +119,4 @@ class MonolythCompiler {
         return apps;
     }
 }
-exports.MonolythCompiler = MonolythCompiler;
+exports.MonolythBundler = MonolythBundler;

package/lib/bundler/monolyth/stages/1_mkdir_stage.d.ts

@@ -0,0 +1,15 @@
+import { MonolythApp } from "../monolyth.app";
+import { MonolythBundler } from '../monolyth.bundler';
+/**
+ * [Monolyth Compiler Stage #1]
+ * Create the directory structure
+ *
+ * @category Monolyth Compiler
+ * @subcategory Stages
+ */
+export declare class MkdirStage {
+    private bundler;
+    private app;
+    constructor(bundler: MonolythBundler, app: MonolythApp<any, any>);
+    run(): Promise<void>;
+}

package/lib/{compiler/apps → bundler}/monolyth/stages/1_mkdir_stage.js

@@ -36,8 +36,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MkdirStage = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const space_1 = require("../../../../engine/space");
-const log_1 = require("../../../../engine/util/log");
+const space_1 = require("../../../engine/space");
+const log_1 = require("../../../engine/util/log");
 /**
  * [Monolyth Compiler Stage #1]
  * Create the directory structure
@@ -46,14 +46,14 @@ const log_1 = require("../../../../engine/util/log");
  * @subcategory Stages
  */
 class MkdirStage {
-    constructor(monolyth, app) {
-        this.monolyth = monolyth;
+    constructor(bundler, app) {
+        this.bundler = bundler;
         this.app = app;
     }
     async run() {
         log_1.Log.info('compiler', 'monolyth', 'Creating build directory tree');
-        const dirs = this.monolyth.dirs;
-        dirs.build = space_1.Space.path(this.monolyth.compiler.space, 'build', this.app.name);
+        const dirs = this.bundler.dirs;
+        dirs.build = space_1.Space.path(this.bundler.compiler.space, 'build', this.app.name);
         // Remove build folder
         log_1.Log.debug('compiler', 'monolyth', `Removing folder ${dirs.build}`);
         fs.rmSync(dirs.build, { recursive: true, force: true });

package/lib/bundler/monolyth/stages/2_build_typescript_stage.d.ts

@@ -0,0 +1,15 @@
+import { MonolythApp } from "../monolyth.app";
+import { MonolythBundler } from '../monolyth.bundler';
+/**
+ * [Monolyth Compiler Stage #2]
+ * Build typescript files to build folder
+ *
+ * @category Monolyth Compiler
+ * @subcategory Stages
+ */
+export declare class BuildTypescriptStage {
+    private bundler;
+    private app;
+    constructor(bundler: MonolythBundler, app: MonolythApp<any, any>);
+    run(): Promise<void>;
+}

package/lib/{compiler/apps → bundler}/monolyth/stages/2_build_typescript_stage.js

@@ -36,10 +36,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuildTypescriptStage = void 0;
 const ts = __importStar(require("typescript"));
 const path = __importStar(require("path"));
-const space_1 = require("../../../../engine/space");
-const log_1 = require("../../../../engine/util/log");
-const typescript_compiler_1 = require("../../../typescript/typescript_compiler");
-const app_1 = require("../../../../engine/apps/app");
+const space_1 = require("../../../engine/space");
+const log_1 = require("../../../engine/util/log");
+const typescript_compiler_1 = require("../../../compiler/typescript/typescript_compiler");
+const app_1 = require("../../../engine/app/app");
 /**
  * [Monolyth Compiler Stage #2]
  * Build typescript files to build folder
@@ -48,13 +48,13 @@ const app_1 = require("../../../../engine/apps/app");
  * @subcategory Stages
  */
 class BuildTypescriptStage {
-    constructor(monolyth, app) {
-        this.monolyth = monolyth;
+    constructor(bundler, app) {
+        this.bundler = bundler;
         this.app = app;
     }
     async run() {
         log_1.Log.info('compiler', 'monolyth', 'Building TypeScript files...');
-        const { config, compiler, dirs, appPath } = this.monolyth;
+        const { config, compiler, dirs, appPath } = this.bundler;
         const libPaths = (config.libPaths || []).map(path => {
             return space_1.Space.path(compiler.space, path);
         });
@@ -161,6 +161,7 @@ class BuildTypescriptStage {
             // Built methods don't carry all the typings, so we disable this check
             // However, this has been checked before Compiler built them
             noImplicitAny: false,
+            ...this.bundler.tsconfig
         }, spacePath, dirs.build, replacePaths);
         if (emitCode !== 0) {
             throw new Error('One or more TypeScript files contains errors.');

package/lib/bundler/monolyth/stages/3_copy_types_stage.d.ts

@@ -0,0 +1,15 @@
+import { MonolythApp } from "../monolyth.app";
+import { MonolythBundler } from '../monolyth.bundler';
+/**
+ * [Monolyth Compiler Stage #3]
+ * Copy type declarations to build/types folder
+ *
+ * @category Monolyth Compiler
+ * @subcategory Stages
+ */
+export declare class CopyTypesStage {
+    private bundler;
+    private app;
+    constructor(bundler: MonolythBundler, app: MonolythApp<any, any>);
+    run(): Promise<void>;
+}

package/lib/{compiler/apps → bundler}/monolyth/stages/3_copy_types_stage.js

@@ -36,10 +36,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyTypesStage = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const space_1 = require("../../../../engine/space");
-const log_1 = require("../../../../engine/util/log");
-const name_helpers_1 = require("../../../helpers/name_helpers");
-const app_1 = require("../../../../engine/apps/app");
+const space_1 = require("../../../engine/space");
+const log_1 = require("../../../engine/util/log");
+const name_helpers_1 = require("../../../engine/util/name_helpers");
+const app_1 = require("../../../engine/app/app");
 /**
  * [Monolyth Compiler Stage #3]
  * Copy type declarations to build/types folder
@@ -48,13 +48,13 @@ const app_1 = require("../../../../engine/apps/app");
  * @subcategory Stages
  */
 class CopyTypesStage {
-    constructor(monolyth, app) {
-        this.monolyth = monolyth;
+    constructor(bundler, app) {
+        this.bundler = bundler;
         this.app = app;
     }
     async run() {
         log_1.Log.info('compiler', 'monolyth', 'Copying module and space types from .nesoi to build/types folder...');
-        const { compiler, dirs } = this.monolyth;
+        const { compiler, dirs } = this.bundler;
         const info = app_1.App.getInfo(this.app);
         // Copy module types to types folder
         for (const name of info.spaceModules) {

package/lib/{compiler/apps → bundler}/monolyth/stages/4_dump_modules_stage.d.ts

@@ -1,5 +1,5 @@
-import { MonolythApp } from "../../../../engine/apps/monolyth/monolyth.app";
-import { MonolythCompiler } from '../monolyth_compiler';
+import { MonolythApp } from "../monolyth.app";
+import { MonolythBundler } from '../monolyth.bundler';
 /**
  * [Monolyth Compiler Stage #4]
  * Dump modules to build/modules folder.
@@ -8,9 +8,9 @@ import { MonolythCompiler } from '../monolyth_compiler';
  * @subcategory Stages
  */
 export declare class DumpModulesStage {
-    private monolyth;
+    private bundler;
     private app;
-    constructor(monolyth: MonolythCompiler, app: MonolythApp<any, any>);
+    constructor(bundler: MonolythBundler, app: MonolythApp<any, any>);
     run(): Promise<void>;
     private dumpModule;
 }