nesoi 3.3.11 → 3.3.13

package/lib/bundler/browser/browser.bundler.js

@@ -10,13 +10,10 @@ const console_1 = __importDefault(require("../../engine/util/console"));
 const log_1 = require("../../engine/util/log");
 const _8_replace_nesoi_for_browser_stage_1 = require("./stages/8_replace_nesoi_for_browser_stage");
 class BrowserBundler extends monolyth_bundler_1.MonolythBundler {
-    constructor() {
-        super(...arguments);
-        this.tsconfig = {
-            module: typescript_1.default.ModuleKind.ESNext,
-            moduleResolution: typescript_1.default.ModuleResolutionKind.Bundler,
-        };
-    }
+    tsconfig = {
+        module: typescript_1.default.ModuleKind.ESNext,
+        moduleResolution: typescript_1.default.ModuleResolutionKind.Bundler,
+    };
     async run() {
         await super.run();
         console_1.default.header('Browser Bundler');

package/lib/bundler/browser/stages/8_replace_nesoi_for_browser_stage.js

@@ -45,6 +45,7 @@ const path_1 = require("../../../engine/util/path");
  * @subcategory Stages
  */
 class ReplaceNesoiForBrowserStage {
+    bundler;
     constructor(bundler) {
         this.bundler = bundler;
     }

package/lib/bundler/distributed/distributed.bundler.js

@@ -53,6 +53,10 @@ const app_1 = require("../../engine/app/app");
 const distributed_app_1 = require("../../engine/app/native/distributed.app");
 const path_1 = require("../../engine/util/path");
 class DistributedBundler {
+    compiler;
+    appPath;
+    config;
+    dirs;
     constructor(compiler, appPath, config = {}) {
         this.compiler = compiler;
         this.appPath = appPath;
@@ -82,20 +86,18 @@ class DistributedBundler {
         }
     }
     mergeServicePaths(app) {
-        var _a;
         const services = app_1.App.getServices(app);
         for (const name in services) {
             const service = services[name];
             if (!service.libPaths)
                 continue;
-            (_a = this.config).libPaths ?? (_a.libPaths = []);
+            this.config.libPaths ??= [];
             this.config.libPaths.push(...service.libPaths);
         }
     }
     expandLibPaths() {
-        var _a;
         const expandedPaths = [];
-        (_a = this.config).libPaths ?? (_a.libPaths = []);
+        this.config.libPaths ??= [];
         for (const path of this.config.libPaths) {
             const expanded = path_1.Path.expandWildcard(path);
             expandedPaths.push(...expanded);

package/lib/bundler/distributed/stages/1_mkdir_stage.js

@@ -46,6 +46,8 @@ const log_1 = require("../../../engine/util/log");
  * @subcategory Stages
  */
 class MkdirStage {
+    bundler;
+    app;
     constructor(bundler, app) {
         this.bundler = bundler;
         this.app = app;

package/lib/bundler/distributed/stages/2_build_typescript_stage.js

@@ -48,6 +48,8 @@ const app_1 = require("../../../engine/app/app");
  * @subcategory Stages
  */
 class BuildTypescriptStage {
+    bundler;
+    app;
     constructor(bundler, app) {
         this.bundler = bundler;
         this.app = app;
@@ -149,7 +151,7 @@ class BuildTypescriptStage {
                 ...binFiles,
                 ...moduleFiles
             ], {
-                target: ts.ScriptTarget.ES2020,
+                target: ts.ScriptTarget.ES2022,
                 module: ts.ModuleKind.CommonJS,
                 moduleResolution: ts.ModuleResolutionKind.Node10,
                 noEmitOnError: true,

package/lib/bundler/distributed/stages/3_copy_types_stage.js

@@ -48,6 +48,8 @@ const app_1 = require("../../../engine/app/app");
  * @subcategory Stages
  */
 class CopyTypesStage {
+    bundler;
+    app;
     constructor(bundler, app) {
         this.bundler = bundler;
         this.app = app;

package/lib/bundler/distributed/stages/4_dump_modules_stage.js

@@ -46,6 +46,8 @@ const app_1 = require("../../../engine/app/app");
  * @subcategory Stages
  */
 class DumpModulesStage {
+    bundler;
+    app;
     constructor(bundler, app) {
         this.bundler = bundler;
         this.app = app;

package/lib/bundler/monolyth/monolyth.bundler.js

@@ -53,11 +53,15 @@ const app_1 = require("../../engine/app/app");
 const monolyth_app_1 = require("../../engine/app/native/monolyth.app");
 const path_1 = require("../../engine/util/path");
 class MonolythBundler {
+    compiler;
+    appPath;
+    config;
+    tsconfig = {};
+    dirs;
     constructor(compiler, appPath, config = {}) {
         this.compiler = compiler;
         this.appPath = appPath;
         this.config = config;
-        this.tsconfig = {};
         this.dirs = {};
     }
     async run() {
@@ -83,20 +87,18 @@ class MonolythBundler {
         }
     }
     mergeServicePaths(app) {
-        var _a;
         const services = app_1.App.getServices(app);
         for (const name in services) {
             const service = services[name];
             if (!service.libPaths)
                 continue;
-            (_a = this.config).libPaths ?? (_a.libPaths = []);
+            this.config.libPaths ??= [];
             this.config.libPaths.push(...service.libPaths);
         }
     }
     expandLibPaths() {
-        var _a;
         const expandedPaths = [];
-        (_a = this.config).libPaths ?? (_a.libPaths = []);
+        this.config.libPaths ??= [];
         for (const path of this.config.libPaths) {
             const expanded = path_1.Path.expandWildcard(path);
             expandedPaths.push(...expanded);

package/lib/bundler/monolyth/stages/1_mkdir_stage.js

@@ -46,6 +46,8 @@ const log_1 = require("../../../engine/util/log");
  * @subcategory Stages
  */
 class MkdirStage {
+    bundler;
+    app;
     constructor(bundler, app) {
         this.bundler = bundler;
         this.app = app;

package/lib/bundler/monolyth/stages/2_build_typescript_stage.js

@@ -48,6 +48,8 @@ const app_1 = require("../../../engine/app/app");
  * @subcategory Stages
  */
 class BuildTypescriptStage {
+    bundler;
+    app;
     constructor(bundler, app) {
         this.bundler = bundler;
         this.app = app;
@@ -146,7 +148,7 @@ class BuildTypescriptStage {
             ...binFiles,
             ...moduleFiles
         ], {
-            target: ts.ScriptTarget.ES2020,
+            target: ts.ScriptTarget.ES2022,
             module: ts.ModuleKind.CommonJS,
             moduleResolution: ts.ModuleResolutionKind.Node10,
             noEmitOnError: true,

package/lib/bundler/monolyth/stages/3_copy_types_stage.js

@@ -48,6 +48,8 @@ const app_1 = require("../../../engine/app/app");
  * @subcategory Stages
  */
 class CopyTypesStage {
+    bundler;
+    app;
     constructor(bundler, app) {
         this.bundler = bundler;
         this.app = app;

package/lib/bundler/monolyth/stages/4_dump_modules_stage.js

@@ -50,6 +50,8 @@ const typescript_1 = __importDefault(require("typescript"));
  * @subcategory Stages
  */
 class DumpModulesStage {
+    bundler;
+    app;
     constructor(bundler, app) {
         this.bundler = bundler;
         this.app = app;

package/lib/bundler/monolyth/stages/5_copy_static_stage.js

@@ -47,6 +47,8 @@ const space_1 = require("../../../engine/space");
  * @subcategory Stages
  */
 class CopyStaticStage {
+    bundler;
+    app;
     constructor(bundler, app) {
         this.bundler = bundler;
         this.app = app;

package/lib/bundler/monolyth/stages/6_dump_cli_stage.js

@@ -45,6 +45,8 @@ const log_1 = require("../../../engine/util/log");
  * @subcategory Stages
  */
 class DumpCLIStage {
+    bundler;
+    app;
     constructor(bundler, app) {
         this.bundler = bundler;
         this.app = app;

package/lib/bundler/monolyth/stages/7_dump_package_json_stage.js

@@ -48,6 +48,8 @@ const app_1 = require("../../../engine/app/app");
  * @subcategory Stages
  */
 class DumpPackageJsonStage {
+    bundler;
+    app;
     constructor(bundler, app) {
         this.bundler = bundler;
         this.app = app;

package/lib/compiler/compiler.js

@@ -19,13 +19,18 @@ const console_1 = __importDefault(require("../engine/util/console"));
 const log_1 = require("../engine/util/log");
 const fs_1 = __importDefault(require("fs"));
 class Compiler {
+    space;
+    config;
+    modules = {};
+    tree;
+    tsCompiler;
+    logFn;
     constructor(space, config) {
         this.space = space;
         this.config = config;
-        this.modules = {};
-        this.tree = new tree_1.ModuleTree({}, this.config);
         console_1.default.header('Compiler');
         log_1.Log.info('compiler', 'ts', 'Loading TypeScript...');
+        this.tree = new tree_1.ModuleTree({}, this.config);
         this.tsCompiler = new typescript_compiler_1.TypeScriptCompiler(space, config?.nesoiPath);
     }
     async run() {

package/lib/compiler/elements/bucket.element.js

@@ -5,6 +5,7 @@ const bucket_model_schema_1 = require("../../elements/entities/bucket/model/buck
 const element_1 = require("./element");
 const dump_helpers_1 = require("../helpers/dump_helpers");
 const name_helpers_1 = require("../../engine/util/name_helpers");
+const regex_1 = require("../../engine/util/regex");
 class BucketElement extends element_1.Element {
     // Prepare
     prepare() {
@@ -97,11 +98,8 @@ class BucketElement extends element_1.Element {
             type = 'string';
         }
         else if (field.type === 'literal') {
-            const regex = field.meta.literal.template;
-            const rtype = regex
-                .replace(/[.][*+]/g, '${string}')
-                .replace(/\\d[*+]?/g, '${number}')
-                .replace(/\\(.)/g, '$1');
+            const regex = field.meta.literal.template.toString();
+            const rtype = regex_1.NesoiRegex.toTemplateString(regex);
             type = `\`${rtype}\``;
         }
         else if (field.type === 'obj') {

package/lib/compiler/elements/constants.element.js

@@ -54,10 +54,10 @@ class ConstantsElement extends element_1.Element {
             let node = enumTree;
             split.forEach((part, i) => {
                 key += key.length ? `.${part}` : part;
-                node[part] ?? (node[part] = {
+                node[part] ??= {
                     _enum: `${this.typeName}['enums']['${key}']`,
                     _subs: []
-                });
+                };
                 if (i < split.length - 1) {
                     if (!node[part]._subs.includes(split[i + 1])) {
                         node[part]._subs.push(split[i + 1]);

package/lib/compiler/elements/controller.element.js

@@ -13,9 +13,9 @@ class ControllerElement extends element_1.Element {
         const type = dump_helpers_1.DumpHelpers.dumpValueToType(this.schema);
         const input = this.schema.input.map(tag => name_helpers_1.NameHelpers.tagType(tag, this.module)).join(' | ');
         return {
+            ...type,
             '#authn': element_1.Element.makeAuthnType(this.schema.auth),
             '#input': input,
-            ...type
         };
     }
 }

package/lib/compiler/elements/element.js

@@ -6,6 +6,21 @@ const name_helpers_1 = require("../../engine/util/name_helpers");
 const dump_helpers_1 = require("../helpers/dump_helpers");
 /* @nesoi:browser ignore-end */
 class Element {
+    compiler;
+    module;
+    $t;
+    files;
+    schema;
+    dependencies;
+    inlineRoot;
+    bridge;
+    static Any = Symbol('undefined as any');
+    static Never = Symbol('undefined as never');
+    type;
+    tag;
+    lowName;
+    highName;
+    typeName;
     constructor(compiler, module, $t, files, schema, dependencies, inlineRoot, bridge) {
         this.compiler = compiler;
         this.module = module;
@@ -108,5 +123,3 @@ class Element {
     }
 }
 exports.Element = Element;
-Element.Any = Symbol('undefined as any');
-Element.Never = Symbol('undefined as never');

package/lib/compiler/elements/externals.element.js

@@ -4,6 +4,18 @@ exports.ExternalsElement = void 0;
 const element_1 = require("./element");
 const dump_helpers_1 = require("../helpers/dump_helpers");
 class ExternalsElement extends element_1.Element {
+    compiler;
+    module;
+    $t;
+    files;
+    schema;
+    dependencies;
+    inlineRoot;
+    bridge;
+    elements = {
+        bucket: {},
+        job: {}
+    };
     constructor(compiler, module, $t, files, schema, dependencies, inlineRoot, bridge) {
         super(compiler, module, $t, files, schema, dependencies, inlineRoot, bridge);
         this.compiler = compiler;
@@ -14,10 +26,6 @@ class ExternalsElement extends element_1.Element {
         this.dependencies = dependencies;
         this.inlineRoot = inlineRoot;
         this.bridge = bridge;
-        this.elements = {
-            bucket: {},
-            job: {}
-        };
     }
     buildType() {
         return {};

package/lib/compiler/elements/message.element.js

@@ -4,6 +4,7 @@ exports.MessageElement = void 0;
 const element_1 = require("./element");
 const dump_helpers_1 = require("../helpers/dump_helpers");
 const name_helpers_1 = require("../../engine/util/name_helpers");
+const regex_1 = require("../../engine/util/regex");
 class MessageElement extends element_1.Element {
     prepare() {
         this.schema['#raw'] = element_1.Element.Any;
@@ -152,6 +153,12 @@ class MessageElement extends element_1.Element {
                 input[key] = '(' + Object.values(child.input).map(t => dump_helpers_1.DumpHelpers.dumpType(t)).join(' | ') + ')';
                 output[key] = '(' + Object.values(child.output).map(t => dump_helpers_1.DumpHelpers.dumpType(t)).join(' | ') + ')';
             }
+            else if (field.type === 'literal') {
+                const regex = field.meta.literal.template;
+                const rtype = regex_1.NesoiRegex.toTemplateString(regex);
+                input[key] = `\`${rtype}\``;
+                output[key] = `\`${rtype}\``;
+            }
             else if (field.type === 'msg') {
                 input[key] = 'any';
                 output[key] = 'any';

package/lib/compiler/elements/queue.element.js

@@ -14,10 +14,10 @@ class QueueElement extends element_1.Element {
         const type = dump_helpers_1.DumpHelpers.dumpValueToType(this.schema);
         delete type['output'];
         return {
+            ...type,
             '#authn': element_1.Element.makeAuthnType(this.schema.auth),
             '#input': input,
             '#output': output,
-            ...type,
         };
     }
 }

package/lib/compiler/elements/topic.element.js

@@ -14,10 +14,10 @@ class TopicElement extends element_1.Element {
         const type = dump_helpers_1.DumpHelpers.dumpValueToType(this.schema);
         delete type['output'];
         return {
+            ...type,
             '#authn': element_1.Element.makeAuthnType(this.schema.auth),
             '#input': input,
             '#output': input,
-            ...type,
         };
     }
 }

package/lib/compiler/module.js

@@ -51,9 +51,14 @@ const queue_element_1 = require("./elements/queue.element");
 const cached_element_1 = require("./elements/cached.element");
 const topic_element_1 = require("./elements/topic.element");
 class CompilerModule {
+    compiler;
+    lowName;
+    highName;
+    typeName;
+    module;
+    elements = [];
     constructor(compiler, name, path, subdir = []) {
         this.compiler = compiler;
-        this.elements = [];
         this.lowName = name;
         this.highName = name_helpers_1.NameHelpers.nameLowToHigh(this.lowName);
         this.typeName = this.highName + 'Module';

package/lib/compiler/stages/1_scan_stage.js

@@ -12,6 +12,7 @@ const log_1 = require("../../engine/util/log");
  * @subcategory Stages
  */
 class ScanStage {
+    compiler;
     constructor(compiler) {
         this.compiler = compiler;
     }

package/lib/compiler/stages/2_treeshake_stage.js

@@ -14,6 +14,7 @@ const progressive_1 = require("../progressive");
  * @subcategory Stages
  */
 class TreeshakeStage {
+    compiler;
     constructor(compiler) {
         this.compiler = compiler;
     }

package/lib/compiler/stages/3_extract_ts_stage.js

@@ -12,6 +12,7 @@ const organize_1 = require("../typescript/bridge/organize");
  * @subcategory Stages
  */
 class ExtractTSStage {
+    compiler;
     constructor(compiler) {
         this.compiler = compiler;
     }

package/lib/compiler/stages/4_build_schemas_stage.js

@@ -11,6 +11,7 @@ const builder_1 = require("../../engine/builder");
  * @subcategory Stages
  */
 class BuildSchemasStage {
+    compiler;
     constructor(compiler) {
         this.compiler = compiler;
     }
@@ -18,7 +19,6 @@ class BuildSchemasStage {
         log_1.Log.info('compiler', 'stage.build_schemas', 'Building schemas...');
         const t0 = new Date().getTime();
         await this.compiler.tree.traverse('Building schemas ', async (node) => {
-            var _a;
             const module = this.compiler.modules[node.tag.module].module;
             if (node.progressive) {
                 await module.inject({
@@ -28,8 +28,8 @@ class BuildSchemasStage {
             }
             // Accummulate imports from depencies
             // (Given that dependencies are built in order)
-            node.bridge ?? (node.bridge = { imports: [] });
-            (_a = node.bridge).imports ?? (_a.imports = []);
+            node.bridge ??= { imports: [] };
+            node.bridge.imports ??= [];
             for (const dep of node.dependencies) {
                 // If a dependency is inline and the node is it's root,
                 // they already share imports.

package/lib/compiler/stages/5_inject_ts_stage.js

@@ -11,6 +11,7 @@ const inject_1 = require("../typescript/bridge/inject");
  * @subcategory Stages
  */
 class InjectTSStage {
+    compiler;
     constructor(compiler) {
         this.compiler = compiler;
     }

package/lib/compiler/stages/6_build_elements_stage.js

@@ -11,6 +11,7 @@ const log_1 = require("../../engine/util/log");
  * @subcategory Stages
  */
 class BuildElementsStage {
+    compiler;
     constructor(compiler) {
         this.compiler = compiler;
     }

package/lib/compiler/stages/7_dump_stage.js

@@ -55,6 +55,9 @@ const progressive_1 = require("../progressive");
  * @subcategory Stages
  */
 class DumpStage {
+    compiler;
+    cache;
+    hash;
     constructor(compiler) {
         this.compiler = compiler;
     }
@@ -156,7 +159,6 @@ class DumpStage {
         });
     }
     dumpModuleType(module, spaceType, dumpDir) {
-        var _a, _b;
         const nesoiPath = this.compiler.config?.nesoiPath ?? 'nesoi';
         const moduleFile = [];
         moduleFile.push(`import { $Module, $Constants, $Bucket, $Message, $Job, $Resource, $Machine, $Controller, $Queue, $Topic } from '${nesoiPath}/lib/elements';`);
@@ -186,11 +188,11 @@ class DumpStage {
         // Dump external imports
         moduleFile.push(...Array.from(moduleDependencies)
             .map(module => `import ${name_helpers_1.NameHelpers.nameLowToHigh(module)}Module from './${module}.module'`));
-        (_a = this.cache.modules)[_b = module.lowName] ?? (_a[_b] = {
+        this.cache.modules[module.lowName] ??= {
             dependencies: {
                 modules: []
             }
-        });
+        };
         this.cache.modules[module.lowName].dependencies.modules = Array.from(moduleDependencies);
         // Build module type (with all elements)
         const type = this.makeModuleType(module);

package/lib/compiler/stages/8_diagnose_stage.js

@@ -16,6 +16,7 @@ const log_1 = require("../../engine/util/log");
  * @subcategory Stages
  */
 class DiagnoseStage {
+    compiler;
     constructor(compiler) {
         this.compiler = compiler;
     }

package/lib/compiler/typescript/bridge/inject.js

@@ -158,7 +158,7 @@ class TSBridgeInject {
             };
         }
         if (extract.outputRaw) {
-            schema.output ?? (schema.output = {});
+            schema.output ??= {};
             schema.output.raw = extract.outputRaw;
             schema['#output'] = undefined; // Will be recalculated by element based on output
         }