@tstdl/base 0.85.26 → 0.86.0-beta10

package/templates/renderers/string.template-renderer.js

@@ -21,7 +21,7 @@ __export(string_template_renderer_exports, {
   StringTemplateRenderer: () => StringTemplateRenderer
 });
 module.exports = __toCommonJS(string_template_renderer_exports);
-var import_container = require("../../container/index.js");
+var import_decorators = require("../../injector/decorators.js");
 var import_type_guards = require("../../utils/type-guards.js");
 var import_template_renderer = require("../template.renderer.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -53,6 +53,6 @@ let StringTemplateRenderer = class StringTemplateRenderer2 extends import_templa
   }
 };
 StringTemplateRenderer = __decorate([
-  (0, import_container.singleton)(),
+  (0, import_decorators.Singleton)(),
   __metadata("design:paramtypes", [])
 ], StringTemplateRenderer);

package/templates/resolvers/file.template-resolver.d.ts

@@ -1,5 +1,5 @@
-import type { Injectable } from '../../container/index.js';
-import { type resolveArgumentType } from '../../container/index.js';
+import type { Resolvable } from '../../injector/interfaces.js';
+import { resolveArgumentType } from '../../injector/interfaces.js';
 import type { TypedOmit } from '../../types.js';
 import { TemplateField } from '../template.model.js';
 import type { TemplateRenderer, TemplateRendererOptions, TemplateRendererString } from '../template.renderer.js';
@@ -12,7 +12,7 @@ export declare const fileTemplateProviderConfig: FileTemplateProviderConfig;
 export declare class FileTemplateField<Renderer extends string = string, Options = any> extends TemplateField<'file', Renderer, Options> {
     templateFile: string;
 }
-export declare class FileTemplateResolver extends TemplateResolver<FileTemplateField> implements Injectable<FileTemplateProviderArgument> {
+export declare class FileTemplateResolver extends TemplateResolver<FileTemplateField> implements Resolvable<FileTemplateProviderArgument> {
     private readonly basePath;
     readonly [resolveArgumentType]: FileTemplateProviderArgument;
     constructor(basePath: string);

package/templates/resolvers/file.template-resolver.js

@@ -35,11 +35,12 @@ __export(file_template_resolver_exports, {
   fileTemplateProviderConfig: () => fileTemplateProviderConfig
 });
 module.exports = __toCommonJS(file_template_resolver_exports);
-var import_container = require("../../container/index.js");
+var fs = __toESM(require("node:fs/promises"), 1);
+var path = __toESM(require("node:path"), 1);
 var import_bad_request_error = require("../../error/bad-request.error.js");
+var import_decorators = require("../../injector/decorators.js");
+var import_interfaces = require("../../injector/interfaces.js");
 var import_schema = require("../../schema/index.js");
-var fs = __toESM(require("fs/promises"), 1);
-var path = __toESM(require("node:path"), 1);
 var import_template_model = require("../template.model.js");
 var import_template_resolver = require("../template.resolver.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -87,10 +88,10 @@ let FileTemplateResolver = class FileTemplateResolver2 extends import_template_r
   }
 };
 FileTemplateResolver = __decorate([
-  (0, import_container.singleton)({
+  (0, import_decorators.Singleton)({
     defaultArgumentProvider: () => fileTemplateProviderConfig.basePath
   }),
-  __param(0, (0, import_container.injectArg)()),
+  __param(0, (0, import_decorators.InjectArg)()),
   __metadata("design:paramtypes", [String])
 ], FileTemplateResolver);
 function fileTemplateField(field) {

package/templates/resolvers/jsx.template-resolver.js

@@ -23,7 +23,7 @@ __export(jsx_template_resolver_exports, {
   jsxTemplateField: () => jsxTemplateField
 });
 module.exports = __toCommonJS(jsx_template_resolver_exports);
-var import_container = require("../../container/index.js");
+var import_decorators = require("../../injector/decorators.js");
 var import_schema = require("../../schema/index.js");
 var import_template_model = require("../template.model.js");
 var import_template_resolver = require("../template.resolver.js");
@@ -60,7 +60,7 @@ let JsxTemplateResolver = class JsxTemplateResolver2 extends import_template_res
   }
 };
 JsxTemplateResolver = __decorate([
-  (0, import_container.singleton)(),
+  (0, import_decorators.Singleton)(),
   __metadata("design:paramtypes", [])
 ], JsxTemplateResolver);
 function jsxTemplateField(field) {

package/templates/resolvers/string.template-resolver.js

@@ -23,7 +23,7 @@ __export(string_template_resolver_exports, {
   stringTemplateField: () => stringTemplateField
 });
 module.exports = __toCommonJS(string_template_resolver_exports);
-var import_container = require("../../container/index.js");
+var import_decorators = require("../../injector/decorators.js");
 var import_schema = require("../../schema/index.js");
 var import_template_model = require("../template.model.js");
 var import_template_resolver = require("../template.resolver.js");
@@ -60,7 +60,7 @@ let StringTemplateResolver = class StringTemplateResolver2 extends import_templa
   }
 };
 StringTemplateResolver = __decorate([
-  (0, import_container.singleton)(),
+  (0, import_decorators.Singleton)(),
   __metadata("design:paramtypes", [])
 ], StringTemplateResolver);
 function stringTemplateField(field) {

package/templates/template-renderer.provider.js

@@ -21,7 +21,7 @@ __export(template_renderer_provider_exports, {
   TemplateRendererProvider: () => TemplateRendererProvider
 });
 module.exports = __toCommonJS(template_renderer_provider_exports);
-var import_container = require("../container/index.js");
+var import_decorators = require("../injector/decorators.js");
 var import_tokens = require("./tokens.js");
 var __decorate = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -68,7 +68,7 @@ let TemplateRendererProvider = class TemplateRendererProvider2 {
   }
 };
 TemplateRendererProvider = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.inject)(import_tokens.TEMPLATE_RENDERERS)),
+  (0, import_decorators.Singleton)(),
+  __param(0, (0, import_decorators.Inject)(import_tokens.TEMPLATE_RENDERERS)),
   __metadata("design:paramtypes", [Array])
 ], TemplateRendererProvider);

package/templates/template-resolver.provider.js

@@ -21,7 +21,7 @@ __export(template_resolver_provider_exports, {
   TemplateResolverProvider: () => TemplateResolverProvider
 });
 module.exports = __toCommonJS(template_resolver_provider_exports);
-var import_container = require("../container/index.js");
+var import_decorators = require("../injector/decorators.js");
 var import_tokens = require("./tokens.js");
 var __decorate = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -68,7 +68,7 @@ let TemplateResolverProvider = class TemplateResolverProvider2 {
   }
 };
 TemplateResolverProvider = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.inject)(import_tokens.TEMPLATE_RESOLVERS)),
+  (0, import_decorators.Singleton)(),
+  __param(0, (0, import_decorators.Inject)(import_tokens.TEMPLATE_RESOLVERS)),
   __metadata("design:paramtypes", [Array])
 ], TemplateResolverProvider);

package/templates/template.service.js

@@ -21,7 +21,7 @@ __export(template_service_exports, {
   TemplateService: () => TemplateService
 });
 module.exports = __toCommonJS(template_service_exports);
-var import_container = require("../container/index.js");
+var import_decorators = require("../injector/decorators.js");
 var import_object = require("../utils/object/object.js");
 var import_throw = require("../utils/throw.js");
 var import_type_guards = require("../utils/type-guards.js");
@@ -78,9 +78,9 @@ let TemplateService = class TemplateService2 {
   }
 };
 TemplateService = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.inject)(import_template_provider.TemplateProvider)),
-  __param(0, (0, import_container.optional)()),
+  (0, import_decorators.Singleton)(),
+  __param(0, (0, import_decorators.Inject)(import_template_provider.TemplateProvider)),
+  __param(0, (0, import_decorators.Optional)()),
   __metadata("design:paramtypes", [
     Object,
     import_template_renderer_provider.TemplateRendererProvider,

package/templates/tokens.d.ts

@@ -1,4 +1,4 @@
 import type { TemplateRenderer } from './template.renderer.js';
 import type { TemplateResolver } from './template.resolver.js';
-export declare const TEMPLATE_RENDERERS: import("../container/index.js").InjectionToken<TemplateRenderer<string, any>[], any>;
-export declare const TEMPLATE_RESOLVERS: import("../container/index.js").InjectionToken<TemplateResolver<import("./template.model.js").TemplateField<string, string, any, any>, unknown>[], any>;
+export declare const TEMPLATE_RENDERERS: import("../injector/token.js").InjectionToken<TemplateRenderer<string, any>[], never>;
+export declare const TEMPLATE_RESOLVERS: import("../injector/token.js").InjectionToken<TemplateResolver<import("./template.model.js").TemplateField<string, string, any, any>, unknown>[], never>;

package/templates/tokens.js

@@ -22,6 +22,6 @@ __export(tokens_exports, {
   TEMPLATE_RESOLVERS: () => TEMPLATE_RESOLVERS
 });
 module.exports = __toCommonJS(tokens_exports);
-var import_container = require("../container/index.js");
-const TEMPLATE_RENDERERS = (0, import_container.injectionToken)("template renderers");
-const TEMPLATE_RESOLVERS = (0, import_container.injectionToken)("template resolvers");
+var import_token = require("../injector/token.js");
+const TEMPLATE_RENDERERS = (0, import_token.injectionToken)("template renderers");
+const TEMPLATE_RESOLVERS = (0, import_token.injectionToken)("template resolvers");

package/text/dynamic-text.model.js

@@ -30,19 +30,18 @@ __export(dynamic_text_model_exports, {
 });
 module.exports = __toCommonJS(dynamic_text_model_exports);
 var import_rxjs = require("rxjs");
-var import_container = require("../container/index.js");
+var import_inject = require("../injector/inject.js");
 var import_api = require("../signals/api.js");
 var import_switch_map = require("../signals/switch-map.js");
 var import_untracked_operator = require("../signals/untracked-operator.js");
 var import_type_guards = require("../utils/type-guards.js");
 var import_localization_service = require("./localization.service.js");
 const missingLocalizationKeyText = "[MISSING LOCALIZATION KEY]";
-function resolveDynamicText(text, localizationService) {
-  const resolvedLocalizationService = localizationService ?? import_container.container.resolve(import_localization_service.LocalizationService);
+function resolveDynamicText(text, localizationService = (0, import_inject.inject)(import_localization_service.LocalizationService)) {
   const localizableTextSignal = (0, import_api.isSignal)(text) ? text : (0, import_rxjs.isObservable)(text) ? (0, import_api.toSignal)(text.pipe((0, import_untracked_operator.runInUntracked)()), { initialValue: missingLocalizationKeyText }) : (0, import_api.computed)(() => text);
   return (0, import_switch_map.switchMap)(() => {
     const localizableText = localizableTextSignal();
-    return (0, import_type_guards.isString)(localizableText) ? (0, import_api.computed)(() => localizableText) : resolvedLocalizationService.localize(localizableText);
+    return (0, import_type_guards.isString)(localizableText) ? (0, import_api.computed)(() => localizableText) : localizationService.localize(localizableText);
   });
 }
 function resolveDynamicText$(text, localizationService) {

package/text/localization.service.js

@@ -30,8 +30,8 @@ __export(localization_service_exports, {
   localizationData: () => localizationData
 });
 module.exports = __toCommonJS(localization_service_exports);
-var import_container = require("../container/index.js");
 var import_details_error = require("../error/details.error.js");
+var import_decorators = require("../injector/decorators.js");
 var import_logger = require("../logger/index.js");
 var import_api = require("../signals/api.js");
 var import_enum = require("../utils/enum.js");
@@ -214,8 +214,8 @@ let LocalizationService = class LocalizationService2 {
   }
 };
 LocalizationService = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.resolveArg)("LocalizationService")),
+  (0, import_decorators.Singleton)(),
+  __param(0, (0, import_decorators.ResolveArg)("LocalizationService")),
   __metadata("design:paramtypes", [import_logger.Logger])
 ], LocalizationService);
 function enumerationLocalization(enumeration, nameOrLocalization, localizationOrNothing) {

package/theme/theme-service.d.ts

@@ -28,7 +28,7 @@ export type ColorTonesWithRgb = ColorTones & {
     [Tone in keyof ColorTones as `${Tone}Rgb`]: string;
 };
 export declare const themeColorTones: readonly [50, 100, 200, 300, 400, 500, 600, 700, 800, 900];
-export declare const DEFAULT_THEME: import("../container/index.js").InjectionToken<Theme<string>, any>;
+export declare const DEFAULT_THEME: import("../injector/token.js").InjectionToken<Theme<string>, never>;
 export declare class ThemeService<Colors extends string = string> {
     private readonly themeSubject;
     private readonly calculatedThemeSubject;

package/theme/theme-service.js

@@ -33,13 +33,14 @@ __export(theme_service_exports, {
   themeColorTones: () => themeColorTones
 });
 module.exports = __toCommonJS(theme_service_exports);
-var import_container = require("../container/index.js");
+var import_chroma_js = __toESM(require("chroma-js"), 1);
+var import_rxjs = require("rxjs");
+var import_decorators = require("../injector/decorators.js");
+var import_token = require("../injector/token.js");
 var import_array = require("../utils/array/array.js");
 var import_memoize = require("../utils/function/memoize.js");
 var import_object = require("../utils/object/object.js");
 var import_type_guards = require("../utils/type-guards.js");
-var import_chroma_js = __toESM(require("chroma-js"), 1);
-var import_rxjs = require("rxjs");
 var __decorate = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -60,7 +61,7 @@ var __param = function(paramIndex, decorator) {
   };
 };
 const themeColorTones = [50, 100, 200, 300, 400, 500, 600, 700, 800, 900];
-const DEFAULT_THEME = (0, import_container.injectionToken)("default theme");
+const DEFAULT_THEME = (0, import_token.injectionToken)("default theme");
 const calculateTheme = (0, import_memoize.memoize)(_calculateTheme, { weak: true });
 const generateColorTones = (0, import_memoize.memoize)(_generateColorTones);
 let ThemeService = class ThemeService2 {
@@ -92,8 +93,8 @@ let ThemeService = class ThemeService2 {
   }
 };
 ThemeService = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.inject)(DEFAULT_THEME)),
+  (0, import_decorators.Singleton)(),
+  __param(0, (0, import_decorators.Inject)(DEFAULT_THEME)),
   __metadata("design:paramtypes", [Object])
 ], ThemeService);
 function _calculateTheme(theme) {

package/tokens.d.ts

@@ -1 +1 @@
-export declare const DOCUMENT: import("./container/token.js").InjectionToken<Document, any>;
+export declare const DOCUMENT: import("./injector/token.js").InjectionToken<Document, never>;

package/tokens.js

@@ -21,5 +21,5 @@ __export(tokens_exports, {
   DOCUMENT: () => DOCUMENT
 });
 module.exports = __toCommonJS(tokens_exports);
-var import_container = require("./container/index.js");
-const DOCUMENT = (0, import_container.injectionToken)("document");
+var import_token = require("./injector/token.js");
+const DOCUMENT = (0, import_token.injectionToken)("document");