@tstdl/base 0.90.29 → 0.90.30

package/api/server/gateway.js

@@ -21,6 +21,7 @@ import { Schema } from '../../schema/index.js';
 import { ServerSentEventsSource } from '../../sse/server-sent-events-source.js';
 import { toArray } from '../../utils/array/array.js';
 import { composeAsyncMiddleware } from '../../utils/middleware.js';
+import { mapObjectValues } from '../../utils/object/object.js';
 import { deferThrow } from '../../utils/throw.js';
 import { isArray, isBlob, isDefined, isNull, isNullOrUndefined, isObject, isReadableStream, isUint8Array, isUndefined } from '../../utils/type-guards.js';
 import { mebibyte } from '../../utils/units.js';
@@ -173,7 +174,8 @@ let ApiGateway = class ApiGateway {
         if (isDefined(bodyAsParameters) && !isObject(bodyAsParameters)) {
             throw new BadRequestError('Expected json object as body.');
         }
-        const parameters = { ...request.query.asObject(), ...bodyAsParameters, ...context.resourcePatternResult.pathname.groups };
+        const decodedUrlParameters = mapObjectValues(context.resourcePatternResult.pathname.groups, (value) => isDefined(value) ? decodeURIComponent(value) : undefined);
+        const parameters = { ...request.query.asObject(), ...bodyAsParameters, ...decodedUrlParameters };
         const validatedParameters = isDefined(context.endpoint.definition.parameters)
             ? Schema.parse(context.endpoint.definition.parameters, parameters)
             : parameters;

package/jsx/index.d.ts

@@ -0,0 +1,2 @@
+export * from './is-component-class.js';
+export * from './render-to-string.js';

package/jsx/index.js

@@ -0,0 +1,2 @@
+export * from './is-component-class.js';
+export * from './render-to-string.js';

package/jsx/is-component-class.d.ts

@@ -0,0 +1,2 @@
+import type { ComponentClass, FunctionComponent } from 'preact';
+export declare function isComponentClass(template: FunctionComponent<any> | ComponentClass<any, any>): template is ComponentClass<any, any>;

package/jsx/is-component-class.js

@@ -0,0 +1,5 @@
+import { Component } from 'preact';
+import { typeExtends } from '../utils/index.js';
+export function isComponentClass(template) {
+    return typeExtends(template, Component);
+}

package/jsx/render-to-string.d.ts

@@ -0,0 +1,3 @@
+import type { ComponentClass, FunctionComponent, VNode } from 'preact';
+export declare function renderJsx(template: FunctionComponent<void> | ComponentClass<void, void> | VNode): string;
+export declare function renderJsx<Properties>(template: FunctionComponent<Properties> | ComponentClass<Properties, any>, properties: Properties): string;

package/jsx/render-to-string.js

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "preact/jsx-runtime";
+import { isFunction } from '../utils/type-guards.js';
+import { render } from 'preact-render-to-string';
+export function renderJsx(Template, properties) {
+    if (isFunction(Template)) {
+        return render(_jsx(Template, { ...properties }));
+    }
+    return render(Template);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.90.29",
+  "version": "0.90.30",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -53,6 +53,7 @@
     "./injector": "./injector/index.js",
     "./intl": "./intl/index.js",
     "./json-path": "./json-path/index.js",
+    "./jsx": "./jsx/index.js",
     "./key-value-store": "./key-value-store/index.js",
     "./lock": "./lock/index.js",
     "./lock/mongo": "./lock/mongo/index.js",
@@ -109,7 +110,7 @@
     "luxon": "^3.4",
     "reflect-metadata": "^0.1",
     "rxjs": "^7.8",
-    "type-fest": "^4.6"
+    "type-fest": "^4.7"
   },
   "devDependencies": {
     "@mxssfd/typedoc-theme": "1.1",
@@ -149,7 +150,7 @@
     "nodemailer": "^6.9",
     "playwright": "^1.39",
     "preact": "^10.18",
-    "preact-render-to-string": "^6.2",
+    "preact-render-to-string": "^6.3",
     "undici": "^5.27",
     "urlpattern-polyfill": "^9.0"
   },

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

@@ -6,5 +6,5 @@ export type JsxTemplateRenderObject = TemplateRenderObject<'jsx', undefined, Jsx
 export declare class JsxTemplateRenderer extends TemplateRenderer<'jsx', undefined> {
     constructor();
     canHandleType(type: string): boolean;
-    _render({ template: TemplateComponent }: JsxTemplateRenderObject, context: Record): TemplateRenderResult;
+    _render({ template }: JsxTemplateRenderObject, context: Record): TemplateRenderResult;
 }

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

@@ -7,11 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { jsx as _jsx } from "preact/jsx-runtime";
 import { Singleton } from '../../injector/decorators.js';
-import { assertNotNull } from '../../utils/type-guards.js';
-import { Component } from 'preact';
-import { render } from 'preact-render-to-string';
+import { renderJsx } from '../../jsx/render-to-string.js';
 import { TemplateRenderer } from '../template.renderer.js';
 let JsxTemplateRenderer = class JsxTemplateRenderer extends TemplateRenderer {
     constructor() {
@@ -20,10 +17,8 @@ let JsxTemplateRenderer = class JsxTemplateRenderer extends TemplateRenderer {
     canHandleType(type) {
         return (type == 'jsx');
     }
-    _render({ template: TemplateComponent }, context) {
-        const node = isComponentClass(TemplateComponent) ? _jsx(TemplateComponent, { ...context }) : TemplateComponent(context, context);
-        assertNotNull(node, 'Template returned null');
-        return render(node);
+    _render({ template }, context) {
+        return renderJsx(template, context);
     }
 };
 JsxTemplateRenderer = __decorate([
@@ -31,6 +26,3 @@ JsxTemplateRenderer = __decorate([
     __metadata("design:paramtypes", [])
 ], JsxTemplateRenderer);
 export { JsxTemplateRenderer };
-function isComponentClass(template) {
-    return Reflect.getPrototypeOf(template) == Component;
-}

package/utils/html-link-utils.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Dynamically set a webmanifest
+ * Note: The link-element has to be statically added (href can be empty), otherwise it wont work.
+ */
+export declare function setWebManifest(linkSelector: string, manifest: object): void;

package/utils/html-link-utils.js

@@ -0,0 +1,16 @@
+import { NotFoundError } from '../errors/not-found.error.js';
+import { isNull } from './type-guards.js';
+/**
+ * Dynamically set a webmanifest
+ * Note: The link-element has to be statically added (href can be empty), otherwise it wont work.
+ */
+export function setWebManifest(linkSelector, manifest) {
+    const link = document.querySelector(linkSelector);
+    if (isNull(link)) {
+        throw new NotFoundError(`Link element "${linkSelector}" not found.`);
+    }
+    const manifestString = JSON.stringify(manifest);
+    const blob = new Blob([manifestString], { type: 'application/json' });
+    const manifestURL = URL.createObjectURL(blob);
+    link.setAttribute('href', manifestURL);
+}

package/utils/index.d.ts

@@ -23,6 +23,7 @@ export * from './file-reader.js';
 export * from './format-error.js';
 export * from './format.js';
 export * from './helpers.js';
+export * from './html-link-utils.js';
 export * from './image.js';
 export * from './jwt.js';
 export * from './map.js';

package/utils/index.js

@@ -23,6 +23,7 @@ export * from './file-reader.js';
 export * from './format-error.js';
 export * from './format.js';
 export * from './helpers.js';
+export * from './html-link-utils.js';
 export * from './image.js';
 export * from './jwt.js';
 export * from './map.js';

package/utils/type/extends.d.ts

@@ -1,2 +1,3 @@
 import type { AbstractConstructor } from '../../types.js';
-export declare function typeExtends(type: AbstractConstructor, base: AbstractConstructor): boolean;
+export declare function typeExtends<Type extends AbstractConstructor, Base extends Type>(type: Type, base: Base): type is Base;
+export declare function typeExtends<Base extends AbstractConstructor>(type: AbstractConstructor, base: Base): type is Base;

package/utils/url-builder.js

@@ -1,4 +1,4 @@
-import { normalizeHttpValue, normalizeSingleHttpValue } from '../http/types.js';
+import { normalizeSingleHttpValue } from '../http/types.js';
 import { memoizeSingle } from './function/memoize.js';
 import { isArray, isDefined, isObject, isUndefined } from './type-guards.js';
 var UrlBuilderPartType;
@@ -44,8 +44,8 @@ export function compileUrlBuilder(url) {
                     throw new Error(`Url parameter ${part.value} is an object. (${url})`);
                 }
                 parsedUrl += isArray(value)
-                    ? value.map(normalizeHttpValue).join(arraySeparator)
-                    : normalizeSingleHttpValue(value);
+                    ? value.map((httpValue) => encodeURIComponent(normalizeSingleHttpValue(httpValue))).join(arraySeparator)
+                    : encodeURIComponent(normalizeSingleHttpValue(value));
             }
         }
         return { parsedUrl, parametersRest };