@ts-ioc-container/bundler 3.1.0 → 4.0.0

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

@@ -36,49 +36,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadTsconfig = loadTsconfig;
+exports.loadImportPaths = loadImportPaths;
 const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const ts = __importStar(require("typescript"));
 const DomainException_1 = require("../../../exceptions/DomainException");
 const ImportPaths_1 = require("./ImportPaths");
-const scan_1 = require("./scan");
 const NO_INPUTS = 18003;
-function commonDir(files) {
-    if (files.length === 0)
-        return undefined;
-    const [first, ...rest] = files.map((file) => node_path_1.default.dirname(file).split(node_path_1.default.sep));
-    let length = first.length;
-    for (const parts of rest) {
-        let i = 0;
-        while (i < length && i < parts.length && parts[i] === first[i])
-            i++;
-        length = i;
+function loadImportPaths(tsconfig, importExtension) {
+    if (!(0, node_fs_1.existsSync)(tsconfig.file)) {
+        if (tsconfig.required)
+            throw new DomainException_1.TicConfigError(`tsconfig not found: ${tsconfig.file}`);
+        return new ImportPaths_1.ImportPaths([], importExtension ?? '');
     }
-    return first.slice(0, length).join(node_path_1.default.sep) || node_path_1.default.sep;
-}
-function asTsconfig(config) {
-    if (!(0, node_fs_1.existsSync)(config.tsconfig.file)) {
-        if (config.tsconfig.required)
-            throw new DomainException_1.TicConfigError(`tsconfig not found: ${config.tsconfig.file}`);
-        return { config: config.overrides };
-    }
-    if (config.file === config.tsconfig.file)
-        return ts.readConfigFile(config.file, ts.sys.readFile);
-    return { config: { extends: config.tsconfig.file, ...config.overrides } };
-}
-function loadTsconfig(config) {
-    const { config: json, error } = asTsconfig(config);
-    const configFileName = config.file === config.tsconfig.file ? config.file : undefined;
-    const parsed = ts.parseJsonConfigFileContent(json ?? {}, ts.sys, config.dir, undefined, configFileName);
+    const { config, error } = ts.readConfigFile(tsconfig.file, ts.sys.readFile);
+    const parsed = ts.parseJsonConfigFileContent(config, ts.sys, node_path_1.default.dirname(tsconfig.file), undefined, tsconfig.file);
     const [fatal] = [error, ...parsed.errors].filter((d) => !!d && d.code !== NO_INPUTS);
     if (fatal) {
-        throw new DomainException_1.TicConfigError(`${config.file}: ${ts.flattenDiagnosticMessageText(fatal.messageText, '\n')}`);
+        throw new DomainException_1.TicConfigError(`${tsconfig.file}: ${ts.flattenDiagnosticMessageText(fatal.messageText, '\n')}`);
     }
-    const fileNames = parsed.fileNames.map((file) => node_path_1.default.resolve(file));
-    return {
-        importPaths: ImportPaths_1.ImportPaths.fromOptions(parsed.options, config.file, config.importExtension),
-        fileNames,
-        rootDir: parsed.options.rootDir ?? commonDir(fileNames.filter(scan_1.isSourceFile)) ?? config.dir,
-    };
+    return ImportPaths_1.ImportPaths.fromOptions(parsed.options, tsconfig.file, importExtension);
 }

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

@@ -21,15 +21,13 @@ const ts_ioc_container_1 = require("ts-ioc-container");
 const GlobalConfig_1 = require("../../../domain/GlobalConfig");
 const HandlebarsRenderService_1 = require("../../../services/HandlebarsRenderService");
 const NodeFileSystemService_1 = require("../../../services/NodeFileSystemService");
-const BuildConfig_1 = require("../BuildConfig");
-const configFiles_1 = require("../domain/configFiles");
+const DomainException_1 = require("../../../exceptions/DomainException");
+const TicConfigService_1 = require("./TicConfigService");
 const emit_1 = require("../domain/emit");
 const glob_1 = require("../domain/glob");
 const scan_1 = require("../domain/scan");
 const tokenCollisions_1 = require("../domain/tokenCollisions");
 const tsconfig_1 = require("../domain/tsconfig");
-const TicConfigService_1 = require("./TicConfigService");
-const DEFAULT_EXCLUDE_GLOBS = BuildConfig_1.DEFAULT_EXCLUDE.map(glob_1.globToRegExp);
 exports.IBundleBuilderKey = new ts_ioc_container_1.SingleToken('IBundleBuilder');
 let BundleBuilder = class BundleBuilder {
     cwd;
@@ -42,44 +40,53 @@ let BundleBuilder = class BundleBuilder {
         this.fs = fs;
         this.renderer = renderer;
     }
-    build({ config, check = false } = {}) {
-        const resolved = config === undefined
-            ? (0, BuildConfig_1.resolveConfig)({ extends: BuildConfig_1.DEFAULT_EXTENDS }, node_path_1.default.join((0, configFiles_1.findPackageRoot)(this.cwd), TicConfigService_1.TSCONFIG_FILE))
-            : this.configs.load(node_path_1.default.resolve(this.cwd, config));
-        const { output, content, registrations, warnings } = this.generate(resolved);
-        const current = this.fs.fileExists(output) ? this.fs.readFile(output) : undefined;
-        const status = current === content ? 'unchanged' : check ? 'stale' : 'written';
-        if (status === 'written')
-            this.fs.writeFile(output, content);
+    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));
+        const { content, registrations, warnings } = this.generate(resolved);
         return {
-            config: resolved.file,
-            output: { file: output, bundle: resolved.className, status, registrations, content },
-            warnings,
+            config: 'text' in request ? undefined : resolved.file,
+            bundle: resolved.bundleClassName,
+            registrations,
+            content,
+            warnings: [...resolved.warnings, ...warnings],
         };
     }
     generate(config) {
-        const { importPaths: paths, fileNames, rootDir } = (0, tsconfig_1.loadTsconfig)(config);
-        const output = config.output ?? node_path_1.default.join(rootDir, `${config.name}.bundle.ts`);
+        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 { include, exclude } = config.glob;
         const isExcluded = (file) => {
-            if (file === output)
+            const filename = relative(file);
+            if (include && !include.some((glob) => glob.test(filename)))
                 return true;
-            const filename = (0, glob_1.toPosix)(node_path_1.default.relative(config.dir, file));
-            return DEFAULT_EXCLUDE_GLOBS.some((glob) => glob.test(filename));
+            return exclude.some((glob) => glob.test(filename));
         };
-        const files = fileNames.filter((file) => (0, scan_1.isSourceFile)(file) && !isExcluded(file));
-        const classes = files
+        const files = new Set();
+        for (const entry of config.glob.paths) {
+            const dir = paths.resolveNamespace(entry.path, config.dir);
+            for (const file of (0, scan_1.listSourceFiles)(dir, entry.recursive, isExcluded))
+                files.add(file);
+        }
+        const classes = [...files]
             .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.classes, text);
+            return text.startsWith(emit_1.GENERATED_HEADER) ? [] : (0, scan_1.findClasses)(file, config.className, text);
         })
-            .map((cls) => ({ ...cls, specifier: paths.specifier(output, cls.file) }));
+            .map((cls) => ({ ...cls, specifier: paths.specifier(cls.file) }));
+        const uncovered = [...new Set(classes.filter((cls) => cls.specifier === undefined).map((cls) => cls.file))];
+        if (uncovered.length > 0) {
+            throw new DomainException_1.TicConfigError(`no tsconfig paths alias covers ${uncovered.map((file) => (0, glob_1.toPosix)(node_path_1.default.relative(config.dir, file))).join(', ')}; ` +
+                `the bundle goes to stdout, so every import is written through an alias — add a "paths" entry to ${(0, glob_1.toPosix)(node_path_1.default.relative(config.dir, config.tsconfig.file))}`);
+        }
         const content = this.renderer.render(emit_1.BUNDLE_PROTOCOL, (0, emit_1.bundleView)({
-            name: config.className,
-            configPath: (0, glob_1.toPosix)(node_path_1.default.relative(node_path_1.default.dirname(output), config.file)),
-            classes,
+            name: config.bundleClassName,
+            paths: config.glob.paths.map((entry) => entry.path),
+            classes: classes.map((cls) => ({ ...cls, specifier: cls.specifier })),
         }));
-        return { output, content, registrations: classes.length, warnings: (0, tokenCollisions_1.tokenCollisions)(classes) };
+        return { content, registrations: classes.length, warnings: (0, tokenCollisions_1.tokenCollisions)(classes) };
     }
 };
 exports.BundleBuilder = BundleBuilder;

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

@@ -15,54 +15,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TicConfigService = exports.ITicConfigServiceKey = exports.TSCONFIG_FILE = void 0;
+exports.TicConfigService = exports.ITicConfigServiceKey = void 0;
 const node_path_1 = __importDefault(require("node:path"));
 const ts_ioc_container_1 = require("ts-ioc-container");
-const yaml_1 = require("yaml");
-const GlobalConfig_1 = require("../../../domain/GlobalConfig");
 const DomainException_1 = require("../../../exceptions/DomainException");
 const NodeFileSystemService_1 = require("../../../services/NodeFileSystemService");
 const BuildConfig_1 = require("../BuildConfig");
-const configFiles_1 = require("../domain/configFiles");
-exports.TSCONFIG_FILE = 'tsconfig.json';
 exports.ITicConfigServiceKey = new ts_ioc_container_1.SingleToken('ITicConfigService');
 let TicConfigService = class TicConfigService {
-    cwd;
     fs;
-    constructor(cwd, fs) {
-        this.cwd = cwd;
+    constructor(fs) {
         this.fs = fs;
     }
     load(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)(parseConfig(file, this.fs.readFile(file)), file);
+        return (0, BuildConfig_1.resolveConfig)((0, BuildConfig_1.parseConfig)(this.fs.readFile(file), format), file);
     }
-    discover(named) {
-        if (named.length > 0)
-            return named.map((config) => node_path_1.default.resolve(this.cwd, config));
-        const root = (0, configFiles_1.findPackageRoot)(this.cwd);
-        const found = (0, configFiles_1.findConfigFiles)(root);
-        if (found.length > 0)
-            return found;
-        if (this.fs.fileExists(node_path_1.default.join(root, exports.TSCONFIG_FILE)))
-            return [undefined];
-        throw new DomainException_1.TicConfigError(`no *.bundle.{json,yaml,yml} or ${exports.TSCONFIG_FILE} in ${root}; name a config with --config`);
+    parse(text, dir) {
+        return (0, BuildConfig_1.resolveConfig)((0, BuildConfig_1.parseConfig)(text, 'yaml'), node_path_1.default.join(dir, BuildConfig_1.STDIN));
     }
 };
 exports.TicConfigService = TicConfigService;
 exports.TicConfigService = TicConfigService = __decorate([
     (0, ts_ioc_container_1.register)(exports.ITicConfigServiceKey),
-    __param(0, (0, ts_ioc_container_1.inject)((0, GlobalConfig_1.globalConfig)('cwd'))),
-    __param(1, (0, ts_ioc_container_1.inject)((0, ts_ioc_container_1.by)(NodeFileSystemService_1.IFileSystemServiceKey))),
-    __metadata("design:paramtypes", [String, Object])
+    __param(0, (0, ts_ioc_container_1.inject)((0, ts_ioc_container_1.by)(NodeFileSystemService_1.IFileSystemServiceKey))),
+    __metadata("design:paramtypes", [Object])
 ], TicConfigService);
-function parseConfig(file, text) {
-    const yaml = file.endsWith('.yaml') || file.endsWith('.yml');
-    try {
-        return yaml ? ((0, yaml_1.parse)(text) ?? {}) : JSON.parse(text);
-    }
-    catch (e) {
-        throw new DomainException_1.TicConfigError(`${file} is not valid ${yaml ? 'YAML' : 'JSON'}: ${e.message}`);
-    }
-}

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.isSourceFile = exports.findClasses = exports.loadTsconfig = exports.ImportPaths = exports.ticConfigJsonSchema = exports.findPackageRoot = exports.findConfigFiles = exports.toClassName = exports.DEFAULT_DECORATORS = exports.DEFAULT_BUNDLE_NAME = exports.DEFAULT_EXCLUDE = exports.DEFAULT_EXTENDS = exports.CONFIG_FILE_SUFFIXES = exports.BUNDLE_CONFIG_SCHEMA = exports.resolveConfig = exports.TSCONFIG_FILE = 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.StaleBundlesError = exports.UsageError = exports.UnknownActionError = exports.UnknownCommandError = exports.MissingCommandError = exports.TicConfigError = exports.TicError = exports.renderProtocol = exports.HandlebarsRenderService = exports.IRenderServiceKey = exports.NodeFileSystemService = exports.IFileSystemServiceKey = exports.ConsoleLogger = void 0;
+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;
 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; } });
@@ -33,28 +33,27 @@ Object.defineProperty(exports, "IBundleBuilderKey", { enumerable: true, get: fun
 var TicConfigService_1 = require("./features/build/services/TicConfigService");
 Object.defineProperty(exports, "TicConfigService", { enumerable: true, get: function () { return TicConfigService_1.TicConfigService; } });
 Object.defineProperty(exports, "ITicConfigServiceKey", { enumerable: true, get: function () { return TicConfigService_1.ITicConfigServiceKey; } });
-Object.defineProperty(exports, "TSCONFIG_FILE", { enumerable: true, get: function () { return TicConfigService_1.TSCONFIG_FILE; } });
 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, "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, "DEFAULT_EXTENDS", { enumerable: true, get: function () { return BuildConfig_1.DEFAULT_EXTENDS; } });
+Object.defineProperty(exports, "STDIN", { enumerable: true, get: function () { return BuildConfig_1.STDIN; } });
+Object.defineProperty(exports, "configFormat", { enumerable: true, get: function () { return BuildConfig_1.configFormat; } });
+Object.defineProperty(exports, "DEFAULT_TSCONFIG", { enumerable: true, get: function () { return BuildConfig_1.DEFAULT_TSCONFIG; } });
 Object.defineProperty(exports, "DEFAULT_EXCLUDE", { enumerable: true, get: function () { return BuildConfig_1.DEFAULT_EXCLUDE; } });
-Object.defineProperty(exports, "DEFAULT_BUNDLE_NAME", { enumerable: true, get: function () { return BuildConfig_1.DEFAULT_BUNDLE_NAME; } });
 Object.defineProperty(exports, "DEFAULT_DECORATORS", { enumerable: true, get: function () { return BuildConfig_1.DEFAULT_DECORATORS; } });
 Object.defineProperty(exports, "toClassName", { enumerable: true, get: function () { return BuildConfig_1.toClassName; } });
-var configFiles_1 = require("./features/build/domain/configFiles");
-Object.defineProperty(exports, "findConfigFiles", { enumerable: true, get: function () { return configFiles_1.findConfigFiles; } });
-Object.defineProperty(exports, "findPackageRoot", { enumerable: true, get: function () { return configFiles_1.findPackageRoot; } });
 var ticConfigSchema_1 = require("./schema/ticConfigSchema");
 Object.defineProperty(exports, "ticConfigJsonSchema", { enumerable: true, get: function () { return ticConfigSchema_1.ticConfigJsonSchema; } });
 var ImportPaths_1 = require("./features/build/domain/ImportPaths");
 Object.defineProperty(exports, "ImportPaths", { enumerable: true, get: function () { return ImportPaths_1.ImportPaths; } });
 var tsconfig_1 = require("./features/build/domain/tsconfig");
-Object.defineProperty(exports, "loadTsconfig", { enumerable: true, get: function () { return tsconfig_1.loadTsconfig; } });
+Object.defineProperty(exports, "loadImportPaths", { enumerable: true, get: function () { return tsconfig_1.loadImportPaths; } });
 var scan_1 = require("./features/build/domain/scan");
 Object.defineProperty(exports, "findClasses", { enumerable: true, get: function () { return scan_1.findClasses; } });
 Object.defineProperty(exports, "isSourceFile", { enumerable: true, get: function () { return scan_1.isSourceFile; } });
+Object.defineProperty(exports, "listSourceFiles", { enumerable: true, get: function () { return scan_1.listSourceFiles; } });
 var emit_1 = require("./features/build/domain/emit");
 Object.defineProperty(exports, "emitBundle", { enumerable: true, get: function () { return emit_1.emitBundle; } });
 Object.defineProperty(exports, "bundleView", { enumerable: true, get: function () { return emit_1.bundleView; } });
@@ -84,10 +83,10 @@ Object.defineProperty(exports, "renderProtocol", { enumerable: true, get: functi
 var DomainException_1 = require("./exceptions/DomainException");
 Object.defineProperty(exports, "TicError", { enumerable: true, get: function () { return DomainException_1.TicError; } });
 Object.defineProperty(exports, "TicConfigError", { enumerable: true, get: function () { return DomainException_1.TicConfigError; } });
+Object.defineProperty(exports, "NamespaceNotFoundError", { enumerable: true, get: function () { return DomainException_1.NamespaceNotFoundError; } });
 Object.defineProperty(exports, "MissingCommandError", { enumerable: true, get: function () { return DomainException_1.MissingCommandError; } });
 Object.defineProperty(exports, "UnknownCommandError", { enumerable: true, get: function () { return DomainException_1.UnknownCommandError; } });
 Object.defineProperty(exports, "UnknownActionError", { enumerable: true, get: function () { return DomainException_1.UnknownActionError; } });
 Object.defineProperty(exports, "UsageError", { enumerable: true, get: function () { return DomainException_1.UsageError; } });
-Object.defineProperty(exports, "StaleBundlesError", { enumerable: true, get: function () { return DomainException_1.StaleBundlesError; } });
 var ExceptionHandler_1 = require("./exceptions/ExceptionHandler");
 Object.defineProperty(exports, "ExceptionHandler", { enumerable: true, get: function () { return ExceptionHandler_1.ExceptionHandler; } });

package/cjm/schema/ticConfigSchema.js

@@ -8,13 +8,17 @@ function ticConfigJsonSchema() {
         io: 'input',
         target: 'draft-7',
         unrepresentable: 'any',
+        override: ({ jsonSchema }) => {
+            if (jsonSchema.type === 'object')
+                jsonSchema.additionalProperties = false;
+        },
     });
     const { $schema, ...rest } = schema;
     return {
         $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` builds every `*.bundle.json` / `*.bundle.yaml` / `*.bundle.yml` at the root of the package it is invoked in, or — with none — one bundle from that package's tsconfig.json with every setting at its default. `extends` and `baseUrl` resolve against this file's directory; `include`, `exclude` and `output` resolve against `baseUrl`, defaulting to this file's directory.",
+        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).",
         ...rest,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ts-ioc-container/bundler",
-  "version": "3.1.0",
+  "version": "4.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": "75.0.0"
+    "ts-ioc-container": "76.0.0"
   },
   "peerDependencies": {
     "typescript": ">=5"

package/tic.schema.json

@@ -2,124 +2,157 @@
   "$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` builds every `*.bundle.json` / `*.bundle.yaml` / `*.bundle.yml` at the root of the package it is invoked in, or — with none — one bundle from that package's tsconfig.json with every setting at its default. `extends` and `baseUrl` resolve against this file's directory; `include`, `exclude` and `output` resolve against `baseUrl`, defaulting to this file's directory.",
+  "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).",
   "type": "object",
   "properties": {
     "$schema": {
       "type": "string"
     },
-    "extends": {
-      "default": "./tsconfig.json",
-      "description": "The tsconfig this bundle extends, as a tsconfig's own `extends`: its file set, `paths` aliases and module resolution apply unless this file overrides them. Relative to this file. The default may be absent; a tsconfig named here must exist.",
-      "type": "string",
-      "minLength": 1
-    },
-    "baseUrl": {
-      "description": "The base folder this config's relative `include`, `exclude` and `output` resolve against, so they need not repeat a shared prefix such as `src`. Relative to this file; default this file's directory. Also handed to TypeScript as `compilerOptions.baseUrl` (unless that is set too), so generated imports use it.",
+    "name": {
+      "description": "The bundle's name: letters, digits, \"-\" and \"_\", starting with a letter. Default: the config file's stem (production.bundle.json → production); required for a config file named otherwise. It names the generated IContainerModule class (ProductionBundle).",
       "type": "string",
-      "minLength": 1
+      "pattern": "^[A-Za-z][\\w-]*$"
     },
-    "output": {
-      "description": "The bundle file (convention: *.bundle.ts). Default `<root>/<name>.bundle.ts`: <root> is the compiled rootDir, else the common folder of the files compiled.",
+    "tsconfig": {
+      "default": "./tsconfig.json",
+      "description": "The tsconfig whose `paths` aliases glob.paths may name and generated imports are written in, and whose module resolution sets the import extension. It adds no files: the bundle scans glob.paths alone. Relative to the config file. The default may be absent; a tsconfig named here must exist.",
       "type": "string",
       "minLength": 1
     },
-    "name": {
-      "description": "The bundle's name: letters, digits, \"-\" and \"_\", starting with a letter. Default: this file's stem (production.bundle.json → production), else \"base\". It names the default output (production.bundle.ts) and the generated IContainerModule class (ProductionBundle).",
-      "type": "string",
-      "pattern": "^[A-Za-z][\\w-]*$"
-    },
-    "include": {
-      "description": "tsconfig `include`: replaces the extended tsconfig's. Relative to `baseUrl`. When `baseUrl` is set and this is omitted, the whole `baseUrl` folder (`.`) is scanned.",
-      "type": "array",
-      "items": {
-        "type": "string",
-        "minLength": 1
-      }
+    "importExtension": {
+      "description": "Extension of generated imports, e.g. \".js\". Inferred from the tsconfig: \".js\" under node16/nodenext resolution, none otherwise.",
+      "type": "string"
     },
-    "exclude": {
-      "description": "tsconfig `exclude`: replaces the extended tsconfig's. Relative to `baseUrl`.",
-      "type": "array",
-      "items": {
-        "type": "string",
-        "minLength": 1
-      }
+    "glob": {
+      "type": "object",
+      "properties": {
+        "paths": {
+          "minItems": 1,
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "type": "string",
+                "minLength": 1
+              },
+              {
+                "type": "object",
+                "properties": {
+                  "path": {
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "recursive": {
+                    "default": true,
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "path"
+                ],
+                "additionalProperties": false
+              }
+            ]
+          },
+          "description": "Folders to scan: paths relative to the config file (./src/services) or tsconfig paths aliases (@app/services). Sub-folders are scanned too unless an entry says { \"path\": \"...\", \"recursive\": false }."
+        },
+        "include": {
+          "description": "Globs a file must match one of, e.g. [\"**/*.service.ts\", \"**/*.repository.ts\"]. Default: every source file.",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "minLength": 1
+          },
+          "minItems": 1
+        },
+        "exclude": {
+          "default": [
+            "**/*.spec.ts",
+            "**/*.test.ts",
+            "**/*.spec.tsx",
+            "**/*.test.tsx",
+            "**/__tests__/**",
+            "**/node_modules/**"
+          ],
+          "description": "Globs of files never read. Replaces the default when given. A non-empty list that omits a default glob makes `tic build` warn.",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "minLength": 1
+          }
+        }
+      },
+      "required": [
+        "paths"
+      ],
+      "additionalProperties": false,
+      "description": "Which files this bundle reads and parses — decided by path alone, before parsing. `paths` are the folders the files come from; within them a file is parsed when it matches one of `include` and none of `exclude`. Globs are relative to the config file. With a file naming convention, `include` keeps every other file unread."
     },
-    "compilerOptions": {
+    "className": {
       "type": "object",
       "properties": {
-        "importExtension": {
-          "description": "Extension of generated imports, e.g. \".js\". Inferred from the tsconfig: \".js\" under node16/nodenext resolution, none otherwise.",
-          "type": "string"
+        "export": {
+          "default": "any",
+          "description": "Which exports count.",
+          "type": "string",
+          "enum": [
+            "any",
+            "named",
+            "default"
+          ]
+        },
+        "decorators": {
+          "default": [
+            "register"
+          ],
+          "description": "The class must carry one of these decorators, recognised by name (e.g. \"register\", or a composed decorator). Default [\"register\"]; [] requires none.",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "minLength": 1
+          }
         },
-        "classes": {
-          "type": "object",
-          "properties": {
-            "export": {
-              "default": "any",
-              "description": "Which exports count.",
+        "glob": {
+          "description": "Glob, or globs, the class name must match one of, e.g. \"*Service\" or [\"*Service\", \"*Repository\"]. An anonymous default export is named after its file.",
+          "anyOf": [
+            {
               "type": "string",
-              "enum": [
-                "any",
-                "named",
-                "default"
-              ]
+              "minLength": 1
             },
-            "decorators": {
-              "default": [
-                "register"
-              ],
-              "description": "The class must carry one of these decorators, recognised by name (e.g. \"register\", or a composed decorator). Default [\"register\"]; [] requires none.",
+            {
               "type": "array",
               "items": {
                 "type": "string",
                 "minLength": 1
-              }
-            },
-            "name": {
-              "description": "Glob the class name must match, e.g. \"*Service\". An anonymous default export is named after its file.",
+              },
+              "minItems": 1
+            }
+          ]
+        },
+        "exclude": {
+          "description": "Glob, or globs, the class name must match none of, applied after every other criterion. A plain name is a glob too: [\"MockUserRepository\", \"*Fake\"].",
+          "anyOf": [
+            {
               "type": "string",
               "minLength": 1
             },
-            "excludeClasses": {
-              "description": "Class names to drop after selection, e.g. one test double sitting next to the real registration in the same file.",
+            {
               "type": "array",
               "items": {
                 "type": "string",
                 "minLength": 1
               },
               "minItems": 1
-            },
-            "excludeName": {
-              "description": "Glob the class name must NOT match, e.g. \"*Mock\". An anonymous default export is named after its file.",
-              "type": "string",
-              "minLength": 1
             }
-          },
-          "additionalProperties": false,
-          "description": "Which classes of a scanned 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."
-        },
-        "paths": {
-          "description": "tsconfig `paths`: aliases the generated imports are written in.",
-          "type": "object",
-          "propertyNames": {
-            "type": "string"
-          },
-          "additionalProperties": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
-          }
-        },
-        "rootDir": {
-          "description": "tsconfig `rootDir`: where the default output (<rootDir>/<name>.bundle.ts) goes.",
-          "type": "string"
+          ]
         }
       },
-      "additionalProperties": {},
-      "description": "tsconfig `compilerOptions`, plus the bundler's own `importExtension` and `classes`. Every other option is handed to TypeScript on top of the extended tsconfig's, which validates it."
+      "additionalProperties": false,
+      "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."
     }
   },
+  "required": [
+    "glob"
+  ],
   "additionalProperties": false
 }