@tstdl/base 0.83.25 → 0.83.26

package/examples/template/basic.js

@@ -9,14 +9,22 @@ var import_jsx_template_renderer = require("../../templates/renderers/jsx.templa
 var import_file_template_resolver = require("../../templates/resolvers/file.template-resolver.js");
 var import_jsx_template_resolver = require("../../templates/resolvers/jsx.template-resolver.js");
 var import_node_path = require("node:path");
+var import_node_url = require("node:url");
+const import_meta = {};
+let dirname;
+try {
+  dirname = (0, import_node_url.fileURLToPath)(new URL(".", import_meta.url));
+} catch {
+  dirname = __dirname;
+}
 (0, import_core.configureTstdl)();
 (0, import_templates.configureTemplates)({
   templateProvider: import_file_template_provider.FileTemplateProvider,
   templateResolvers: [import_file_template_resolver.FileTemplateResolver, import_jsx_template_resolver.JsxTemplateResolver],
   templateRenderers: [import_handlebars_template_renderer.HandlebarsTemplateRenderer, import_jsx_template_renderer.JsxTemplateRenderer]
 });
-(0, import_file_template_provider.configureFileTemplateProvider)({ basePath: (0, import_node_path.resolve)(__dirname, "templates") });
-(0, import_file_template_resolver.configureFileTemplateResolver)({ basePath: (0, import_node_path.resolve)(__dirname.replace("dist", "source"), "templates") });
+(0, import_file_template_provider.configureFileTemplateProvider)({ basePath: (0, import_node_path.resolve)(dirname, "templates") });
+(0, import_file_template_resolver.configureFileTemplateResolver)({ basePath: (0, import_node_path.resolve)(dirname.replace("dist", "source"), "templates") });
 async function test() {
   const templateService = await import_container.container.resolveAsync(import_templates.TemplateService);
   const handlebarsResult = await templateService.render("hello-name", { name: "Max Mustermann" });

package/object-storage/s3/s3.object-storage.js

@@ -86,7 +86,12 @@ let S3ObjectStorage = class S3ObjectStorage2 extends import_object_storage.Objec
   }
   async uploadObjectStream(key, stream, options) {
     const bucketKey = this.getBucketKey(key);
-    await this.client.putObject(this.bucket, bucketKey, import_node_stream.Readable.fromWeb(stream), options?.metadata);
+    const readable = import_node_stream.Readable.fromWeb(stream);
+    const errorPromise = new Promise((_, reject) => readable.on("error", reject));
+    await Promise.race([
+      this.client.putObject(this.bucket, bucketKey, readable, options?.metadata),
+      errorPromise
+    ]);
   }
   async getContent(key) {
     const bucketKey = this.getBucketKey(key);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.83.25",
+  "version": "0.83.26",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -31,8 +31,8 @@
     "@types/mjml": "4.7",
     "@types/node": "18",
     "@types/nodemailer": "6.4",
-    "@typescript-eslint/eslint-plugin": "5.58",
-    "@typescript-eslint/parser": "5.58",
+    "@typescript-eslint/eslint-plugin": "5.59",
+    "@typescript-eslint/parser": "5.59",
     "concurrently": "8.0",
     "esbuild": "0.17",
     "eslint": "8.38",
@@ -46,22 +46,22 @@
     "@elastic/elasticsearch": "^8.7",
     "@koa/router": "^12.0",
     "@tstdl/angular": "^0.83",
-    "@zxcvbn-ts/core": "2.2",
-    "@zxcvbn-ts/language-common": "2.0",
-    "@zxcvbn-ts/language-de": "2.1",
-    "@zxcvbn-ts/language-en": "2.1",
+    "@zxcvbn-ts/core": "^2.2",
+    "@zxcvbn-ts/language-common": "^2.0",
+    "@zxcvbn-ts/language-de": "^2.1",
+    "@zxcvbn-ts/language-en": "^2.1",
     "chroma-js": "^2.4",
     "handlebars": "^4.7",
     "knex": "^2.4",
     "koa": "^2.14",
     "minio": "^7.0",
     "mjml": "^4.14",
-    "mongodb": "5.2",
+    "mongodb": "^5.3",
     "nodemailer": "^6.9",
     "preact": "^10.13",
-    "preact-render-to-string": "^5.2",
-    "puppeteer": "^19.9",
-    "undici": "^5.21",
+    "preact-render-to-string": "^6.0",
+    "puppeteer": "^19.10",
+    "undici": "^5.22",
     "urlpattern-polyfill": "^7.0"
   },
   "peerDependenciesMeta": {

package/pool/pool.d.ts

@@ -7,10 +7,15 @@ export type PoolOptions = {
      * @default number of cpu cores
      */
     size?: number;
+    /**
+     * Dipose used instance on error instead of reusing it.
+     * @default false
+     */
+    disposeOnError?: boolean;
 };
 export type PoolUseOptions = {
     /**
-     * Dipose used instance on error instead of reusing it.
+     * Dipose used instance on error instead of reusing it. Overwrites pool instance option
      * @default false
      */
     disposeOnError?: boolean;

package/pool/pool.js

@@ -44,6 +44,7 @@ class Pool {
     this.factory = factory;
     this.disposer = disposer;
     this.logger = logger;
+    this.disposeOnError = options?.disposeOnError ?? false;
     this.freeInstances = new import_array_list.ArrayList();
     this.usedInstances = new import_set.Set();
     this.placeholderInstances = 0;
@@ -96,7 +97,7 @@ class Pool {
       await this.release(instance);
       return result;
     } catch (error) {
-      if (options.disposeOnError == true) {
+      if (options.disposeOnError ?? this.disposeOnError) {
         try {
           await this.disposeInstance(instance);
         } catch (disposeError) {
@@ -135,6 +136,5 @@ class Pool {
       await this.disposer(instance);
       this.usedInstances.delete(instance);
     }
-    await this[import_disposable.disposeAsync]();
   }
 }

package/templates/renderers/handlebars.template-renderer.d.ts

@@ -1,5 +1,5 @@
 import type { ObjectLiteral, Record } from '../../types.js';
-import * as handlebars from 'handlebars';
+import type * as Handlebars from 'handlebars';
 import { TemplateResolverProvider } from '../template-resolver.provider.js';
 import type { TemplateField } from '../template.model.js';
 import type { TemplateRenderObject } from '../template.renderer.js';
@@ -18,12 +18,12 @@ export type HandlebarsTemplateHelperOptions = {
     data?: Record<string>;
     hash: Record<string>;
     lookupProperty: (object: ObjectLiteral, propertyName: string) => unknown;
-    fn?: handlebars.TemplateDelegate;
-    inverse?: handlebars.TemplateDelegate;
+    fn?: Handlebars.TemplateDelegate;
+    inverse?: Handlebars.TemplateDelegate;
 };
 export type HandlebarsTemplateHelper = (context: unknown, args: unknown[], options: HandlebarsTemplateHelperOptions) => any;
 export type HandlebarsTemplateHelpersObject = Record<string, HandlebarsTemplateHelper>;
-export type HandlebarsTemplatePartial = string | TemplateField<string, 'handlebars', HandlebarsRendererOptions> | handlebars.TemplateDelegate;
+export type HandlebarsTemplatePartial = string | TemplateField<string, 'handlebars', HandlebarsRendererOptions> | Handlebars.TemplateDelegate;
 export type HandlebarsTemplatePartialsObject = Record<string, HandlebarsTemplatePartial>;
 export type HandlebarsRendererOptions = {
     strict?: boolean;

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

@@ -35,7 +35,6 @@ var import_container = require("../../container/index.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 handlebars = __toESM(require("handlebars"), 1);
 var import_template_resolver_provider = require("../template-resolver.provider.js");
 var import_template_renderer = require("../template.renderer.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -71,7 +70,8 @@ let HandlebarsTemplateRenderer = class HandlebarsTemplateRenderer2 extends impor
   async _compileHandlebarsTemplate(renderObject) {
     const { template, options = {} } = renderObject;
     const allHelpers = getAllPartialHelpersDeep(renderObject);
-    const renderer = handlebars.compile(template, {
+    const compile = await importHandlebarsCompile();
+    const renderer = compile(template, {
       strict: options.strict ?? true,
       preventIndent: options.preventIndent,
       knownHelpers: (0, import_type_guards.isDefined)(allHelpers) ? (0, import_object.mapObjectValues)(allHelpers, () => true) : void 0,
@@ -126,3 +126,13 @@ function getPartialHelpersDeep(partial) {
   const childEntries = (0, import_object.objectValues)(partial.options?.partials ?? {}).flatMap(getPartialHelpersDeep);
   return [...entries, ...childEntries];
 }
+let handlebarsCompile;
+async function importHandlebarsCompile() {
+  if ((0, import_type_guards.isDefined)(handlebarsCompile)) {
+    return handlebarsCompile;
+  }
+  const handlebars = await import("handlebars");
+  const compile = handlebars.compile ?? handlebars.default?.compile;
+  (0, import_type_guards.assertDefined)(compile, "Could not import handlebars.");
+  return handlebarsCompile = compile;
+}