@ts-ioc-container/bundler 5.1.0 → 7.0.0

package/cjm/features/build/BuildController.js

@@ -23,11 +23,15 @@ const OutputService_1 = require("../../services/OutputService");
 const BuildConfig_1 = require("./BuildConfig");
 const BundleBuilder_1 = require("./services/BundleBuilder");
 exports.BUILD_OPTIONS = zod_1.z.object({ positionals: zod_1.z.array(zod_1.z.string().min(1)) }).transform(({ positionals }, ctx) => {
-    if (positionals.length > 1) {
-        ctx.addIssue({ code: 'custom', path: ['config'], message: `expected one <config>, got ${positionals.join(' ')}` });
+    if (positionals.length > 1 && positionals.includes(BuildConfig_1.STDIN)) {
+        ctx.addIssue({
+            code: 'custom',
+            path: ['config'],
+            message: `${BuildConfig_1.STDIN} reads one config from stdin and cannot be merged with config files`,
+        });
         return zod_1.z.NEVER;
     }
-    return { config: positionals[0] ?? BuildConfig_1.STDIN };
+    return { configs: positionals.length > 0 ? positionals : [BuildConfig_1.STDIN] };
 });
 const buildArgs = (0, cli_1.parseOptions)({}, { positionals: true });
 let BuildController = class BuildController {
@@ -41,10 +45,11 @@ let BuildController = class BuildController {
         this.output = output;
         this.logger = logger;
     }
-    build({ config }) {
-        const label = config === BuildConfig_1.STDIN ? '<stdin>' : config;
+    build({ configs }) {
+        const stdin = configs[0] === BuildConfig_1.STDIN;
+        const label = stdin ? '<stdin>' : configs.join(' + ');
         try {
-            const { content, warnings } = this.builder.build(config === BuildConfig_1.STDIN ? { text: this.stdin() } : { config });
+            const { content, warnings } = this.builder.build(stdin ? { text: this.stdin() } : { config: configs });
             for (const warning of warnings)
                 this.logger.warn(`${label}: ${warning}`);
             this.output.write(content.replace(/\n$/, ''));

package/cjm/features/build/domain/emit.js

@@ -6,9 +6,9 @@ exports.emitBundle = emitBundle;
 const HandlebarsRenderService_1 = require("../../../services/HandlebarsRenderService");
 exports.GENERATED_HEADER = '// Generated by `tic build`';
 exports.BUNDLE_PROTOCOL = 'Bundle.ts.hbs';
-const RUNTIME_IMPORTS = ['IContainer', 'IContainerModule', 'IRegistration', 'Registration'];
+const RUNTIME_IMPORTS = ['IContainer', 'IContainerModule', 'Registration'];
 function bundleView({ name, paths, classes }) {
-    const taken = new Set([...RUNTIME_IMPORTS, 'registrations', name]);
+    const taken = new Set([...RUNTIME_IMPORTS, 'container', name]);
     const uniqueName = (wanted) => {
         let candidate = wanted;
         for (let n = 2; taken.has(candidate); n++)

package/cjm/features/build/domain/tokenCollisions.js

@@ -17,7 +17,7 @@ function tokenCollisions(classes) {
         .map(([token, group]) => {
         const names = group.map((cls) => cls.className);
         return (`decorator token "${token}" is passed by ${names.join(', ')}; ` +
-            `registration is last-wins, exclude one with className.exclude`);
+            `registration is last-wins, exclude one with match.exclude`);
     });
 }
 function scopeDisjoint(group) {

package/cjm/features/build/services/BundleBuilder.js

@@ -43,7 +43,7 @@ let BundleBuilder = class BundleBuilder {
     build(request) {
         const resolved = 'text' in request
             ? this.configs.parse(request.text, this.cwd)
-            : this.configs.load(node_path_1.default.resolve(this.cwd, request.config));
+            : this.configs.load([request.config].flat().map((file) => node_path_1.default.resolve(this.cwd, file)));
         const { content, registrations, warnings } = this.generate(resolved);
         return {
             config: 'text' in request ? undefined : resolved.file,
@@ -56,13 +56,13 @@ let BundleBuilder = class BundleBuilder {
     generate(config) {
         const paths = (0, tsconfig_1.loadImportPaths)(config.tsconfig, config.importExtension);
         const relative = (file) => (0, glob_1.toPosix)(node_path_1.default.relative(config.dir, file));
-        const exclude = config.glob.exclude.flatMap((glob) => paths.resolveGlob(glob, config.dir)).map(glob_1.globToRegExp);
+        const exclude = config.paths.exclude.flatMap((glob) => paths.resolveGlob(glob, config.dir)).map(glob_1.globToRegExp);
         const isExcluded = (file) => {
             const filename = relative(file);
             return exclude.some((glob) => glob.test(filename));
         };
         const files = new Set();
-        for (const folder of config.glob.glob) {
+        for (const folder of config.paths.include) {
             const dir = paths.resolveNamespace(folder, config.dir);
             for (const file of (0, scan_1.listSourceFiles)(dir, isExcluded))
                 files.add(file);
@@ -71,7 +71,7 @@ let BundleBuilder = class BundleBuilder {
             .sort((a, b) => (a < b ? -1 : a > b ? 1 : 0))
             .flatMap((file) => {
             const text = this.fs.readFile(file);
-            return text.startsWith(emit_1.GENERATED_HEADER) ? [] : (0, scan_1.findClasses)(file, config.className, text);
+            return text.startsWith(emit_1.GENERATED_HEADER) ? [] : (0, scan_1.findClasses)(file, config.match, text);
         })
             .map((cls) => ({ ...cls, specifier: paths.specifier(cls.file) }));
         const uncovered = [...new Set(classes.filter((cls) => cls.specifier === undefined).map((cls) => cls.file))];
@@ -81,7 +81,7 @@ let BundleBuilder = class BundleBuilder {
         }
         const content = this.renderer.render(emit_1.BUNDLE_PROTOCOL, (0, emit_1.bundleView)({
             name: config.bundleClassName,
-            paths: config.glob.glob,
+            paths: config.paths.include,
             classes: classes.map((cls) => ({ ...cls, specifier: cls.specifier })),
         }));
         return { content, registrations: classes.length, warnings: (0, tokenCollisions_1.tokenCollisions)(classes) };

package/cjm/features/build/services/TicConfigService.js

@@ -27,16 +27,27 @@ let TicConfigService = class TicConfigService {
     constructor(fs) {
         this.fs = fs;
     }
-    load(file) {
+    load(files) {
+        if (typeof files === 'string' || files.length === 1) {
+            const [file] = [files].flat();
+            return (0, BuildConfig_1.resolveConfig)(this.read(file), file);
+        }
+        const folders = [...new Set(files.map((file) => node_path_1.default.dirname(file)))];
+        if (folders.length > 1) {
+            throw new DomainException_1.TicConfigError(`configs merged into one bundle must sit in one folder, since their relative paths resolve against it: ${folders.join(', ')}`);
+        }
+        return (0, BuildConfig_1.resolveConfig)((0, BuildConfig_1.mergeConfigs)(files.map((file) => ({ file, content: this.read(file) }))), files[files.length - 1]);
+    }
+    parse(text, dir) {
+        return (0, BuildConfig_1.resolveConfig)((0, BuildConfig_1.parseConfig)(text, 'yaml'), node_path_1.default.join(dir, BuildConfig_1.STDIN));
+    }
+    read(file) {
         const format = (0, BuildConfig_1.configFormat)(file);
         if (format === undefined)
             throw new DomainException_1.TicConfigError(`expected a .json, .yaml or .yml config file: ${file}`);
         if (!this.fs.fileExists(file))
             throw new DomainException_1.TicConfigError(`config file not found: ${file}`);
-        return (0, BuildConfig_1.resolveConfig)((0, BuildConfig_1.parseConfig)(this.fs.readFile(file), format), file);
-    }
-    parse(text, dir) {
-        return (0, BuildConfig_1.resolveConfig)((0, BuildConfig_1.parseConfig)(text, 'yaml'), node_path_1.default.join(dir, BuildConfig_1.STDIN));
+        return (0, BuildConfig_1.parseConfig)(this.fs.readFile(file), format);
     }
 };
 exports.TicConfigService = TicConfigService;

package/cjm/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ILoggerKey = exports.StdOutputService = exports.IOutputServiceKey = exports.CommonModule = exports.HelpModule = exports.globToRegExp = exports.tokenCollisions = exports.GENERATED_HEADER = exports.BUNDLE_PROTOCOL = exports.bundleView = exports.emitBundle = exports.listSourceFiles = exports.isSourceFile = exports.findClasses = exports.loadImportPaths = exports.ImportPaths = exports.ticConfigJsonSchema = exports.toClassName = exports.DEFAULT_DECORATORS = exports.DEFAULT_EXCLUDE = exports.DEFAULT_TSCONFIG = exports.configFormat = exports.STDIN = exports.CONFIG_FILE_SUFFIXES = exports.parseConfig = exports.BUNDLE_CONFIG_SCHEMA = exports.resolveConfig = exports.ITicConfigServiceKey = exports.TicConfigService = exports.IBundleBuilderKey = exports.BundleBuilder = exports.BUILD_OPTIONS = exports.BuildController = exports.BuildModule = exports.USAGE = exports.IErrorHandlerKey = exports.validate = exports.parseOptions = exports.commandArgs = exports.DEFAULT_ACTION = exports.onDefault = exports.action = exports.Application = exports.globalConfig = exports.GlobalConfigKey = exports.CliIoKey = exports.createContainer = exports.loadConfig = exports.run = exports.build = void 0;
-exports.ExceptionHandler = exports.UsageError = exports.UnknownActionError = exports.UnknownCommandError = exports.MissingCommandError = exports.NamespaceNotFoundError = exports.TicConfigError = exports.TicError = exports.renderProtocol = exports.HandlebarsRenderService = exports.IRenderServiceKey = exports.NodeFileSystemService = exports.IFileSystemServiceKey = exports.ConsoleLogger = void 0;
+exports.IOutputServiceKey = exports.CommonModule = exports.HelpModule = exports.globToRegExp = exports.tokenCollisions = exports.GENERATED_HEADER = exports.BUNDLE_PROTOCOL = exports.bundleView = exports.emitBundle = exports.listSourceFiles = exports.isSourceFile = exports.findClasses = exports.loadImportPaths = exports.ImportPaths = exports.ticConfigJsonSchema = exports.toClassName = exports.DEFAULT_DECORATORS = exports.DEFAULT_EXCLUDE = exports.DEFAULT_TSCONFIG = exports.configFormat = exports.STDIN = exports.CONFIG_FILE_SUFFIXES = exports.parseConfig = exports.mergeConfigs = exports.BUNDLE_CONFIG_FILE_SCHEMA = exports.BUNDLE_CONFIG_SCHEMA = exports.resolveConfig = exports.ITicConfigServiceKey = exports.TicConfigService = exports.IBundleBuilderKey = exports.BundleBuilder = exports.BUILD_OPTIONS = exports.BuildController = exports.BuildModule = exports.USAGE = exports.IErrorHandlerKey = exports.validate = exports.parseOptions = exports.commandArgs = exports.DEFAULT_ACTION = exports.onDefault = exports.action = exports.Application = exports.globalConfig = exports.GlobalConfigKey = exports.CliIoKey = exports.createContainer = exports.loadConfig = exports.run = exports.build = void 0;
+exports.ExceptionHandler = exports.UsageError = exports.UnknownActionError = exports.UnknownCommandError = exports.MissingCommandError = exports.NamespaceNotFoundError = exports.TicConfigError = exports.TicError = exports.renderProtocol = exports.HandlebarsRenderService = exports.IRenderServiceKey = exports.NodeFileSystemService = exports.IFileSystemServiceKey = exports.ConsoleLogger = exports.ILoggerKey = exports.StdOutputService = void 0;
 var app_1 = require("./app");
 Object.defineProperty(exports, "build", { enumerable: true, get: function () { return app_1.build; } });
 Object.defineProperty(exports, "run", { enumerable: true, get: function () { return app_1.run; } });
@@ -36,6 +36,8 @@ Object.defineProperty(exports, "ITicConfigServiceKey", { enumerable: true, get:
 var BuildConfig_1 = require("./features/build/BuildConfig");
 Object.defineProperty(exports, "resolveConfig", { enumerable: true, get: function () { return BuildConfig_1.resolveConfig; } });
 Object.defineProperty(exports, "BUNDLE_CONFIG_SCHEMA", { enumerable: true, get: function () { return BuildConfig_1.BUNDLE_CONFIG_SCHEMA; } });
+Object.defineProperty(exports, "BUNDLE_CONFIG_FILE_SCHEMA", { enumerable: true, get: function () { return BuildConfig_1.BUNDLE_CONFIG_FILE_SCHEMA; } });
+Object.defineProperty(exports, "mergeConfigs", { enumerable: true, get: function () { return BuildConfig_1.mergeConfigs; } });
 Object.defineProperty(exports, "parseConfig", { enumerable: true, get: function () { return BuildConfig_1.parseConfig; } });
 Object.defineProperty(exports, "CONFIG_FILE_SUFFIXES", { enumerable: true, get: function () { return BuildConfig_1.CONFIG_FILE_SUFFIXES; } });
 Object.defineProperty(exports, "STDIN", { enumerable: true, get: function () { return BuildConfig_1.STDIN; } });

package/cjm/schema/ticConfigSchema.js

@@ -4,7 +4,7 @@ exports.ticConfigJsonSchema = ticConfigJsonSchema;
 const zod_1 = require("zod");
 const BuildConfig_1 = require("../features/build/BuildConfig");
 function ticConfigJsonSchema() {
-    const schema = zod_1.z.toJSONSchema(BuildConfig_1.BUNDLE_CONFIG_SCHEMA, {
+    const schema = zod_1.z.toJSONSchema(BuildConfig_1.BUNDLE_CONFIG_FILE_SCHEMA, {
         io: 'input',
         target: 'draft-7',
         unrepresentable: 'any',
@@ -18,7 +18,7 @@ function ticConfigJsonSchema() {
         $schema,
         $id: 'https://github.com/IgorBabkin/ts-ioc-container/tree/main/packages/bundler/tic.schema.json',
         title: '*.bundle.json / *.bundle.yaml',
-        description: "One bundle generated by `tic build` (@ts-ioc-container/bundler). `tic build app.bundle.json` prints the bundle to stdout, and `cat app.bundle.json | tic build` reads the config from stdin. Relative paths resolve against this file's directory (for piped text, the working directory).",
+        description: "One bundle generated by `tic build` (@ts-ioc-container/bundler). `tic build app.bundle.json` prints the bundle to stdout, `tic build common.bundle.json prod.bundle.json` merges several configs left to right, and `cat app.bundle.json | tic build` reads the config from stdin. Relative paths resolve against this file's directory (for piped text, the working directory).",
         ...rest,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-ioc-container/bundler",
-  "version": "5.1.0",
+  "version": "7.0.0",
   "description": "Bundles your dependencies into a single container module for ts-ioc-container: the `tic` CLI scans folders (by path or tsconfig alias) and generates one typed bundle that registers every class — `container.useModule(new AppBundle())`.",
   "publishConfig": {
     "access": "public",
@@ -52,7 +52,7 @@
     "reflect-metadata": "^0.2.2",
     "yaml": "^2.8.3",
     "zod": "^4.6.5",
-    "ts-ioc-container": "76.0.0"
+    "ts-ioc-container": "76.0.2"
   },
   "peerDependencies": {
     "typescript": ">=5"

package/tic.schema.json

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "https://github.com/IgorBabkin/ts-ioc-container/tree/main/packages/bundler/tic.schema.json",
   "title": "*.bundle.json / *.bundle.yaml",
-  "description": "One bundle generated by `tic build` (@ts-ioc-container/bundler). `tic build app.bundle.json` prints the bundle to stdout, and `cat app.bundle.json | tic build` reads the config from stdin. Relative paths resolve against this file's directory (for piped text, the working directory).",
+  "description": "One bundle generated by `tic build` (@ts-ioc-container/bundler). `tic build app.bundle.json` prints the bundle to stdout, `tic build common.bundle.json prod.bundle.json` merges several configs left to right, and `cat app.bundle.json | tic build` reads the config from stdin. Relative paths resolve against this file's directory (for piped text, the working directory).",
   "type": "object",
   "properties": {
     "$schema": {
@@ -15,7 +15,7 @@
     },
     "tsconfig": {
       "default": "./tsconfig.json",
-      "description": "The tsconfig whose `paths` aliases glob.glob may name and generated imports are written in, and whose module resolution sets the import extension. It adds no files: the bundle scans glob.glob alone. Relative to the config file. The default may be absent; a tsconfig named here must exist.",
+      "description": "The tsconfig whose `paths` aliases paths.include may name and generated imports are written in, and whose module resolution sets the import extension. It adds no files: the bundle scans paths.include alone. Relative to the config file. The default may be absent; a tsconfig named here must exist.",
       "type": "string",
       "minLength": 1
     },
@@ -23,76 +23,55 @@
       "description": "Extension of generated imports, e.g. \".js\". Inferred from the tsconfig: \".js\" under node16/nodenext resolution, none otherwise.",
       "type": "string"
     },
-    "glob": {
-      "anyOf": [
-        {
-          "type": "string",
-          "minLength": 1,
-          "description": "One folder to scan, with the default exclude: shorthand for { \"glob\": [...] }."
-        },
-        {
-          "minItems": 1,
-          "type": "array",
-          "items": {
-            "type": "string",
-            "minLength": 1
-          },
-          "description": "Folders to scan, with the default exclude: shorthand for { \"glob\": [...] }."
-        },
-        {
-          "type": "object",
-          "properties": {
-            "glob": {
-              "anyOf": [
-                {
-                  "type": "string",
-                  "minLength": 1
-                },
-                {
-                  "minItems": 1,
-                  "type": "array",
-                  "items": {
-                    "type": "string",
-                    "minLength": 1
-                  }
-                }
-              ],
-              "description": "Folder, or folders, to scan, sub-folders included: paths relative to the config file (./src/services) or tsconfig paths aliases (@app/services)."
+    "paths": {
+      "description": "Which files this bundle reads and parses — decided by path alone, before parsing. `include` names the folders the files come from; within them a file is parsed unless it matches one of `exclude`. Globs are relative to the config file. Required in the merged config.",
+      "type": "object",
+      "properties": {
+        "include": {
+          "anyOf": [
+            {
+              "type": "string",
+              "minLength": 1
             },
-            "exclude": {
-              "default": [
-                "**/*.spec.ts",
-                "**/*.test.ts",
-                "**/*.spec.tsx",
-                "**/*.test.tsx",
-                "**/__tests__/**",
-                "**/node_modules/**"
-              ],
-              "description": "Glob, or globs, of files never read, relative to the config file or starting with a tsconfig paths alias (@generated/**, or @generated for the whole folder). Replaces the default when given. A non-empty value that omits a default glob makes `tic build` warn.",
-              "anyOf": [
-                {
-                  "type": "string",
-                  "minLength": 1
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "type": "string",
-                    "minLength": 1
-                  }
-                }
-              ]
+            {
+              "minItems": 1,
+              "type": "array",
+              "items": {
+                "type": "string",
+                "minLength": 1
+              }
             }
-          },
-          "required": [
-            "glob"
           ],
-          "additionalProperties": false
+          "description": "Folder, or folders, to scan, sub-folders included: paths relative to the config file (./src/services) or tsconfig paths aliases (@app/services)."
+        },
+        "exclude": {
+          "default": [
+            "**/*.spec.ts",
+            "**/*.test.ts",
+            "**/*.spec.tsx",
+            "**/*.test.tsx",
+            "**/__tests__/**",
+            "**/node_modules/**"
+          ],
+          "description": "Glob, or globs, of files never read, relative to the config file or starting with a tsconfig paths alias (@generated/**, or @generated for the whole folder). Replaces the default when given. A non-empty value that omits a default glob makes `tic build` warn.",
+          "anyOf": [
+            {
+              "type": "string",
+              "minLength": 1
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "minLength": 1
+              }
+            }
+          ]
         }
-      ],
-      "description": "Which files this bundle reads and parses — decided by path alone, before parsing. `glob` names the folders the files come from; within them a file is parsed unless it matches one of `exclude`. Globs are relative to the config file. A folder, or a list of folders, is shorthand for { \"glob\": [...] }."
+      },
+      "additionalProperties": false
     },
-    "className": {
+    "match": {
       "anyOf": [
         {
           "type": "string",
@@ -173,8 +152,5 @@
       "description": "Which classes of a parsed file are registered. A class is selected when it is exported, not abstract, and meets every criterion set here; by default that is every exported class decorated with @register. A glob, or a list of globs, is shorthand for { \"glob\": ... }."
     }
   },
-  "required": [
-    "glob"
-  ],
   "additionalProperties": false
 }

package/tpl/index.cjs

@@ -39,24 +39,13 @@ templates["Bundle.ts.hbs"] = template({"0":function(container,depth0,helpers,par
     + ((stack1 = (lookupProperty(helpers,"join")||(depth0 && lookupProperty(depth0,"join"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? lookupProperty(depth0,"named") : depth0),", ",{"name":"join","hash":{},"data":data,"loc":{"start":{"line":5,"column":101},"end":{"line":5,"column":122}}})) != null ? stack1 : "")
     + " }";
 },"5":function(container,depth0,helpers,partials,data) {
-    var stack1, lookupProperty = container.lookupProperty || function(parent, propertyName) {
-        if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-          return parent[propertyName];
-        }
-        return undefined
-    };
-
-  return "export const registrations: IRegistration[] = [\n"
-    + ((stack1 = lookupProperty(helpers,"each").call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? lookupProperty(depth0,"registrations") : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":10,"column":0},"end":{"line":12,"column":9}}})) != null ? stack1 : "")
-    + "];\n";
+    return "_";
 },"6":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return "  Registration.fromClass("
+  return "    container.addRegistration(Registration.fromClass("
     + ((stack1 = container.lambda(depth0, depth0)) != null ? stack1 : "")
-    + "),\n";
-},"7":function(container,depth0,helpers,partials,data) {
-    return "export const registrations: IRegistration[] = [];\n";
+    + "));\n";
 },"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, lookupProperty = container.lookupProperty || function(parent, propertyName) {
         if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -67,13 +56,15 @@ templates["Bundle.ts.hbs"] = template({"0":function(container,depth0,helpers,par
 
   return "// Generated by `tic build`. Do not edit by hand.\n// Paths: "
     + ((stack1 = (lookupProperty(helpers,"join")||(depth0 && lookupProperty(depth0,"join"))||alias2).call(alias1,(depth0 != null ? lookupProperty(depth0,"paths") : depth0),", ",{"name":"join","hash":{},"data":data,"loc":{"start":{"line":2,"column":10},"end":{"line":2,"column":31}}})) != null ? stack1 : "")
-    + "\nimport { type IContainer, type IContainerModule, type IRegistration"
-    + ((stack1 = lookupProperty(helpers,"if").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"registrations") : depth0)) != null ? lookupProperty(stack1,"length") : stack1),{"name":"if","hash":{},"fn":container.program(0, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":3,"column":67},"end":{"line":3,"column":116}}})) != null ? stack1 : "")
+    + "\nimport { type IContainer, type IContainerModule"
+    + ((stack1 = lookupProperty(helpers,"if").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"registrations") : depth0)) != null ? lookupProperty(stack1,"length") : stack1),{"name":"if","hash":{},"fn":container.program(0, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":3,"column":47},"end":{"line":3,"column":96}}})) != null ? stack1 : "")
     + " } from 'ts-ioc-container';\n"
     + ((stack1 = lookupProperty(helpers,"each").call(alias1,(depth0 != null ? lookupProperty(depth0,"imports") : depth0),{"name":"each","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":4,"column":0},"end":{"line":6,"column":9}}})) != null ? stack1 : "")
-    + "\n"
-    + ((stack1 = lookupProperty(helpers,"if").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"registrations") : depth0)) != null ? lookupProperty(stack1,"length") : stack1),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.program(7, data, 0),"data":data,"loc":{"start":{"line":8,"column":0},"end":{"line":16,"column":7}}})) != null ? stack1 : "")
     + "\nexport class "
-    + ((stack1 = ((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : alias2),(typeof helper === "function" ? helper.call(alias1,{"name":"name","hash":{},"data":data,"loc":{"start":{"line":18,"column":13},"end":{"line":18,"column":23}}}) : helper))) != null ? stack1 : "")
-    + " implements IContainerModule {\n  applyTo(container: IContainer): void {\n    for (const registration of registrations) container.addRegistration(registration);\n  }\n}\n";
+    + ((stack1 = ((helper = (helper = lookupProperty(helpers,"name") || (depth0 != null ? lookupProperty(depth0,"name") : depth0)) != null ? helper : alias2),(typeof helper === "function" ? helper.call(alias1,{"name":"name","hash":{},"data":data,"loc":{"start":{"line":8,"column":13},"end":{"line":8,"column":23}}}) : helper))) != null ? stack1 : "")
+    + " implements IContainerModule {\n  applyTo("
+    + ((stack1 = lookupProperty(helpers,"unless").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"registrations") : depth0)) != null ? lookupProperty(stack1,"length") : stack1),{"name":"unless","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":9,"column":10},"end":{"line":9,"column":54}}})) != null ? stack1 : "")
+    + "container: IContainer): void {\n"
+    + ((stack1 = lookupProperty(helpers,"each").call(alias1,(depth0 != null ? lookupProperty(depth0,"registrations") : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":10,"column":0},"end":{"line":12,"column":9}}})) != null ? stack1 : "")
+    + "  }\n}\n";
 },"useData":true});

package/typings/app.d.ts

@@ -11,14 +11,15 @@ export declare function run(argv: string[], io?: CliIo): number;
  * Generates the bundle a config file describes — `tic build` as a function — and returns
  * it; nothing is written.
  *
- * @throws {TicConfigError} when the config file is missing or unreadable, the config or its tsconfig is invalid, the bundle has no name, or no tsconfig paths alias covers a selected class's file.
+ * @throws {TicConfigError} when a config file is missing or unreadable, several are in different folders, the config or its tsconfig is invalid, the bundle has no name, or no tsconfig paths alias covers a selected class's file.
  * @throws {NamespaceNotFoundError} when a path is neither a folder nor a tsconfig paths alias of one.
  */
 export declare function build({ cwd, ...request }: BuildOptions): BuildResult;
 /**
- * Reads and validates a config file: JSON for `.json`, YAML for `.yaml` / `.yml`.
+ * Reads and validates a config file: JSON for `.json`, YAML for `.yaml` / `.yml`. Given several
+ * in one folder, it merges them left to right, as `tic build a.bundle.yml b.bundle.yml` does.
  *
- * @throws {TicConfigError} when the file is missing, has another extension, cannot be parsed, or does not match the config shape.
+ * @throws {TicConfigError} when a file is missing, has another extension, cannot be parsed, or does not match the config shape; when several files are in different folders.
  */
-export declare function loadConfig(file: string): ResolvedConfig;
+export declare function loadConfig(files: string | string[]): ResolvedConfig;
 //# sourceMappingURL=app.d.ts.map

package/typings/cli/usage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../lib/cli/usage.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,QAkBN,CAAC"}
+{"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../../lib/cli/usage.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,QAoBN,CAAC"}

package/typings/features/build/BuildConfig.d.ts

@@ -1,26 +1,26 @@
 import { z } from 'zod';
 /**
  * Which files a bundle reads and parses: the first, cheap stage of selection,
- * decided by path alone. `glob` names the folders the files come from; within them
+ * decided by path alone. `include` names the folders the files come from; within them
  * a file is parsed unless it matches one of `exclude`. Globs are relative to the
  * config file and `/`-separated.
  */
-export interface GlobSelector {
+export interface PathSelector {
     /**
      * Folder, or folders, to scan recursively: relative to the config file (`./src/services`),
      * or tsconfig `paths` aliases (`@app/services`).
      */
-    glob: string | string[];
+    include: string | string[];
     /**
      * Glob, or globs, of files never read; one may start with a tsconfig `paths` alias
      * (`@generated/**`, or `@generated` for the whole folder). Replaces {@link DEFAULT_EXCLUDE} when given.
      */
     exclude?: string | string[];
 }
-/** A {@link GlobSelector} with its defaults filled in and its globs compiled. */
-export interface ResolvedGlobSelector {
+/** A {@link PathSelector} with its defaults filled in. */
+export interface ResolvedPathSelector {
     /** The folders to scan, as written in the config. */
-    glob: string[];
+    include: string[];
     /** As written in the config: an alias in one is resolved, and the glob compiled, once the tsconfig is loaded. */
     exclude: string[];
 }
@@ -28,7 +28,7 @@ export interface ResolvedGlobSelector {
 export type ExportKind = 'any' | 'named' | 'default';
 /**
  * Which classes of a parsed file are registered: the second stage of selection,
- * run on the files {@link GlobSelector} let through. A class is selected when
+ * run on the files {@link PathSelector} let through. A class is selected when
  * it is exported, not abstract, and meets every criterion set here; an empty
  * rule selects every exported class.
  */
@@ -63,6 +63,8 @@ export interface ResolvedClassSelector {
  * A bundle config file: one bundle, described explicitly — the folders it scans and the
  * classes it registers. `tic build <config>` prints the bundle to stdout; where it is
  * saved is the caller's choice (`tic build app.bundle.json > src/di/app.bundle.ts`).
+ * `tic build common.bundle.yml prod.bundle.yml` merges several into one, left to right
+ * (see {@link mergeConfigs}).
  */
 export interface BundleConfig {
     $schema?: string;
@@ -74,27 +76,28 @@ export interface BundleConfig {
      */
     name?: string;
     /**
-     * The tsconfig whose `paths` aliases `glob.glob` may name and generated imports are
+     * The tsconfig whose `paths` aliases `paths.include` may name and generated imports are
      * written in, and whose `moduleResolution` sets the import extension. It contributes
-     * nothing else: the files scanned are `glob.glob` alone. Relative to the config file.
+     * nothing else: the files scanned are `paths.include` alone. Relative to the config file.
      * Default `./tsconfig.json`, which may be absent; a tsconfig named here must exist.
      */
     tsconfig?: string;
     /** Extension of generated imports. Inferred from the tsconfig's `moduleResolution` when omitted. */
     importExtension?: string;
     /**
-     * Which files are parsed: the folders in `glob.glob`, minus {@link DEFAULT_EXCLUDE} unless
-     * `exclude` says otherwise. A folder or a list of folders is shorthand for `{ glob }`, as on {@link ClassSelector}.
+     * Which files are parsed: the folders in `paths.include`, minus {@link DEFAULT_EXCLUDE} unless
+     * `exclude` says otherwise. Always an object: there is no folder or folder-list shorthand.
+     * Required — though in a config merged with others, only the merged config must have it.
      */
-    glob: string | string[] | GlobSelector;
+    paths: PathSelector;
     /**
      * Which classes of a parsed file are registered. Default: every exported class decorated
-     * with `@register`. A glob or a list of globs is shorthand for `{ glob }`, as on `glob`.
+     * with `@register`. A glob or a list of globs is shorthand for `{ glob }`.
      */
-    className?: string | string[] | ClassSelector;
+    match?: string | string[] | ClassSelector;
 }
 export declare const DEFAULT_TSCONFIG = "./tsconfig.json";
-/** What `className.decorators` requires when omitted: the library's own `@register`. */
+/** What `match.decorators` requires when omitted: the library's own `@register`. */
 export declare const DEFAULT_DECORATORS: string[];
 export declare const DEFAULT_EXCLUDE: string[];
 /** A {@link BundleConfig} whose defaults are filled in and whose paths are absolute. */
@@ -113,9 +116,9 @@ export interface ResolvedConfig {
         required: boolean;
     };
     importExtension?: string;
-    glob: ResolvedGlobSelector;
-    className: ResolvedClassSelector;
-    /** Non-fatal problems found while resolving, e.g. a `glob.exclude` that drops a default test glob. */
+    paths: ResolvedPathSelector;
+    match: ResolvedClassSelector;
+    /** Non-fatal problems found while resolving, e.g. a `paths.exclude` that drops a default test glob. */
     warnings: string[];
 }
 /**
@@ -128,11 +131,11 @@ export declare const BUNDLE_CONFIG_SCHEMA: z.ZodObject<{
     name: z.ZodOptional<z.ZodString>;
     tsconfig: z.ZodOptional<z.ZodString>;
     importExtension: z.ZodOptional<z.ZodString>;
-    glob: z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodObject<{
-        glob: z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>;
+    paths: z.ZodObject<{
+        include: z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>;
         exclude: z.ZodDefault<z.ZodCustom<string | string[], string | string[]>>;
-    }, z.core.$strict>]>;
-    className: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodObject<{
+    }, z.core.$strict>;
+    match: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodObject<{
         export: z.ZodDefault<z.ZodEnum<{
             default: "default";
             any: "any";
@@ -143,6 +146,31 @@ export declare const BUNDLE_CONFIG_SCHEMA: z.ZodObject<{
         exclude: z.ZodOptional<z.ZodCustom<string | string[], string | string[]>>;
     }, z.core.$strict>]>>;
 }, z.core.$strict>;
+/**
+ * One config file among several merged into one bundle: it may leave `paths.include`, or
+ * `paths` altogether, to another — only the merged config must have it. The published
+ * `tic.schema.json` is generated from it, so editors accept a shared config.
+ */
+export declare const BUNDLE_CONFIG_FILE_SCHEMA: z.ZodObject<{
+    $schema: z.ZodOptional<z.ZodString>;
+    name: z.ZodOptional<z.ZodString>;
+    tsconfig: z.ZodOptional<z.ZodString>;
+    importExtension: z.ZodOptional<z.ZodString>;
+    match: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>, z.ZodObject<{
+        export: z.ZodDefault<z.ZodEnum<{
+            default: "default";
+            any: "any";
+            named: "named";
+        }>>;
+        decorators: z.ZodDefault<z.ZodCustom<string[], string[]>>;
+        glob: z.ZodOptional<z.ZodCustom<string | string[], string | string[]>>;
+        exclude: z.ZodOptional<z.ZodCustom<string | string[], string | string[]>>;
+    }, z.core.$strict>]>>;
+    paths: z.ZodOptional<z.ZodObject<{
+        include: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>>;
+        exclude: z.ZodOptional<z.ZodDefault<z.ZodCustom<string | string[], string | string[]>>>;
+    }, z.core.$strict>>;
+}, z.core.$strict>;
 /**
  * A config file is named `<name>.bundle.json`, `<name>.bundle.yaml` or `<name>.bundle.yml`
  * by convention, e.g. `app.bundle.json`; any `.json` / `.yaml` / `.yml` file works.
@@ -162,6 +190,21 @@ export type ConfigFormat = 'json' | 'yaml';
 export declare function parseConfig(text: string, format: ConfigFormat): unknown;
 /** The generated class for a bundle name: `production` -> `ProductionBundle`, `my-app_v2` -> `MyAppV2Bundle`. */
 export declare function toClassName(name: string): string;
+/**
+ * Merges the contents of several config files into one, left to right, as webpack-merge
+ * does: objects merge field by field, a list field — `paths.include`, `paths.exclude`,
+ * `match.glob`, `match.exclude`, `match.decorators` — concatenates without duplicates
+ * (one glob or folder counting as a list of one), and any other value set by a later file
+ * replaces an earlier one. The `match` shorthand merges as `match.glob`. Each file is
+ * validated alone first, so a shared file may leave out `paths`; defaults apply to the
+ * merged config only, so a `paths.exclude` in any file replaces {@link DEFAULT_EXCLUDE}.
+ *
+ * @throws {TicConfigError} when a file's content does not match the config file shape; the message names the file and the field.
+ */
+export declare function mergeConfigs(configs: {
+    file: string;
+    content: unknown;
+}[]): unknown;
 /**
  * Validates parsed config content and resolves its paths against `file`'s directory.
  * Without a `name` the bundle is named after the file: `production.bundle.json` -> `production`.

package/typings/features/build/BuildConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BuildConfig.d.ts","sourceRoot":"","sources":["../../../lib/features/build/BuildConfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BuildConfig.d.ts","sourceRoot":"","sources":["../../../lib/features/build/BuildConfig.ts"],"names":[],"mappings":"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"}