@tstdl/base 0.93.108 → 0.93.110

package/orm/sqls/sqls.js

@@ -8,7 +8,7 @@ import { and, Column, eq, isSQLWrapper, sql, isNotNull as sqlIsNotNull, isNull a
 import { match, P } from 'ts-pattern';
 import { distinct, toArray } from '../../utils/array/array.js';
 import { objectEntries, objectValues } from '../../utils/object/object.js';
-import { assertDefined, isArray, isBoolean, isDefined, isInstanceOf, isNotNull, isNull, isNumber, isObject, isString } from '../../utils/type-guards.js';
+import { assertDefined, isArray, isBoolean, isDefined, isInstanceOf, isNotNull, isNull, isNullOrUndefined, isNumber, isObject, isString } from '../../utils/type-guards.js';
 import { getEnumName } from '../enums.js';
 import { caseWhen } from './case-when.js';
 export const simpleJsonKeyPattern = /^[a-zA-Z0-9_-]+$/u;
@@ -405,10 +405,10 @@ export function jsonbBuildObject(properties) {
  */
 export function buildJsonb(value) {
     if (isSQLWrapper(value)) {
-        return sql `${value}`;
+        return sql `to_jsonb(${value})`;
     }
-    if (isNull(value)) {
-        return sql `null`;
+    if (isNullOrUndefined(value)) {
+        return sql `'null'::jsonb`;
     }
     if (isArray(value)) {
         if (value.length == 0) {
@@ -420,5 +420,5 @@ export function buildJsonb(value) {
     if (isObject(value)) {
         return jsonbBuildObject(value);
     }
-    return sql `${value}`;
+    return sql `${JSON.stringify(value)}::jsonb`;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.93.108",
+  "version": "0.93.110",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -101,8 +101,6 @@
     "./pool": "./pool/index.js",
     "./process": "./process/index.js",
     "./promise": "./promise/index.js",
-    "./task-queue": "./task-queue/index.js",
-    "./task-queue/postgres": "./task-queue/postgres/index.js",
     "./random": "./random/index.js",
     "./rate-limit": "./rate-limit/index.js",
     "./rate-limit/postgres": "./rate-limit/postgres/index.js",
@@ -120,6 +118,8 @@
     "./signals": "./signals/index.js",
     "./signals/implementation": "./signals/implementation/index.js",
     "./sse": "./sse/index.js",
+    "./task-queue": "./task-queue/index.js",
+    "./task-queue/postgres": "./task-queue/postgres/index.js",
     "./templates": "./templates/index.js",
     "./templates/providers": "./templates/providers/index.js",
     "./templates/renderers": "./templates/renderers/index.js",
@@ -128,6 +128,7 @@
     "./text": "./text/index.js",
     "./threading": "./threading/index.js",
     "./types": "./types/index.js",
+    "./typst": "./typst/index.js",
     "./unit-test": "./unit-test/index.js",
     "./utils": "./utils/index.js",
     "./utils/array": "./utils/array/index.js",

package/process/spawn.d.ts

@@ -1,5 +1,5 @@
 import type { ChildProcessWithoutNullStreams } from 'node:child_process';
-import type { Record } from '../types/types.js';
+import type { Record, TypedOmit } from '../types/types.js';
 type WaitReadResultFormat = 'string' | 'binary';
 type WaitReadResultFormatType<T extends WaitReadResultFormat> = T extends 'string' ? string : Uint8Array<ArrayBuffer>;
 export type WaitOptions = {
@@ -35,9 +35,9 @@ export type SpawnCommandResult = TransformStream<Uint8Array, Uint8Array> & {
 export declare function spawnWaitCommand(command: string, args?: string[], options?: SpawnOptions & WaitOptions): Promise<WaitResult>;
 export declare function spawnWaitCommand(command: string, options?: SpawnOptions & WaitOptions): Promise<WaitResult>;
 /** spwans a command, waits for it to complete and reads its output */
-export declare function spawnWaitReadCommand<F extends WaitReadResultFormat>(format: F, command: string, args?: string[], options?: SpawnOptions & WaitOptions): Promise<WaitReadResult<F>>;
+export declare function spawnWaitReadCommand<F extends WaitReadResultFormat>(format: F, command: string, args?: string[], options?: TypedOmit<SpawnOptions, 'arguments'> & WaitOptions): Promise<WaitReadResult<F>>;
 export declare function spawnWaitReadCommand<F extends WaitReadResultFormat>(format: F, command: string, options?: SpawnOptions & WaitOptions): Promise<WaitReadResult<F>>;
 /** Spawns a command as a child process. */
-export declare function spawnCommand(command: string, args?: string[], options?: SpawnOptions): Promise<SpawnCommandResult>;
+export declare function spawnCommand(command: string, args?: string[], options?: TypedOmit<SpawnOptions, 'arguments'>): Promise<SpawnCommandResult>;
 export declare function spawnCommand(command: string, options?: SpawnOptions): Promise<SpawnCommandResult>;
 export {};

package/process/spawn.js

@@ -10,7 +10,7 @@ export async function spawnWaitCommand(command, argsOrOptions, optionsOrNothing)
     return await process.wait({ throwOnNonZeroExitCode: options?.throwOnNonZeroExitCode });
 }
 export async function spawnWaitReadCommand(format, command, argsOrOptions, optionsOrNothing) {
-    const [args, options] = isArray(argsOrOptions) ? [argsOrOptions, optionsOrNothing] : [undefined, argsOrOptions];
+    const [args, options] = isArray(argsOrOptions) ? [argsOrOptions, optionsOrNothing] : [argsOrOptions?.arguments, argsOrOptions];
     const process = await spawnCommand(command, args, options);
     return await process.waitRead(format, { throwOnNonZeroExitCode: options?.throwOnNonZeroExitCode });
 }

package/test5.d.ts

@@ -1,13 +1 @@
 import './polyfills.js';
-import type { NotificationDefinitionMap } from './notification/index.js';
-export type Notifications = NotificationDefinitionMap<{
-    'analysis-started': {
-        payload: {
-            analysisId: string;
-        };
-        view: {
-            name: string;
-        };
-    };
-    'analysis-completed': Record<never, never>;
-}>;

package/test5.js

@@ -1,25 +1,20 @@
 import './polyfills.js';
+import { writeFile } from 'node:fs/promises';
 import { Application } from './application/application.js';
 import { provideModule, provideSignalHandler } from './application/index.js';
-import { inject } from './injector/inject.js';
-import { JsonLogFormatter, PrettyPrintLogFormatter } from './logger/index.js';
+import { PrettyPrintLogFormatter } from './logger/index.js';
 import { provideConsoleLogTransport } from './logger/transports/console.js';
-import { NotificationService } from './notification/server/index.js';
+import { renderTypst } from './typst/render.js';
+const template = `
+I got an ice cream for
+\\$1.50! \\u{1f600}
+`;
 async function main(_cancellationSignal) {
-    const notificationService = inject((NotificationService));
-    const notificationApi = new null();
-    const notification$ = (await notificationApi.stream());
-    const tenantId = 'test-tenant';
-    const userId = 'user-123';
-    await notificationService.send(tenantId, userId, {
-        type: 'analysis-started',
-        triggerSubjectId: userId,
-        payload: { analysisId: 'analysis-456' },
-    });
+    const pdfBytes = await renderTypst(template, { format: 'docx' });
+    await writeFile('/tmp/output.docx', pdfBytes);
 }
 Application.run('Test', [
     provideConsoleLogTransport(PrettyPrintLogFormatter),
-    provideConsoleLogTransport(JsonLogFormatter),
     provideModule(main),
     provideSignalHandler(),
 ]);

package/typst/index.d.ts

@@ -0,0 +1 @@
+export * from './render.js';

package/typst/index.js

@@ -0,0 +1 @@
+export * from './render.js';

package/typst/render.d.ts

@@ -0,0 +1,23 @@
+export type TypstRenderOptions = {
+    /**
+     * The root directory for resolving imports in the Typst source. If not specified, imports will be resolved relative to the location of the source file.
+     */
+    root?: string;
+    /**
+     * The output format for the rendered document.
+     * Note: `docx` output uses pandoc under the hood, which does not support all Typst features.
+     * @default 'pdf'
+     */
+    format?: 'pdf' | 'png' | 'svg' | 'html' | 'docx';
+};
+/**
+ * Renders Typst source code to a file in the specified format.
+ *
+ * ## WARNING
+ * **This function should not be used with untrusted typst source, as it can lead to arbitrary code execution on the system.**
+ *
+ * Requires typst to be installed on the system.
+ * @param source
+ * @param options
+ */
+export declare function renderTypst(source: string, options?: TypstRenderOptions): Promise<Uint8Array>;

package/typst/render.js

@@ -0,0 +1,32 @@
+import { spawnCommand } from '../process/spawn.js';
+import { decodeText } from '../utils/encoding.js';
+/**
+ * Renders Typst source code to a file in the specified format.
+ *
+ * ## WARNING
+ * **This function should not be used with untrusted typst source, as it can lead to arbitrary code execution on the system.**
+ *
+ * Requires typst to be installed on the system.
+ * @param source
+ * @param options
+ */
+export async function renderTypst(source, options) {
+    const format = options?.format ?? 'pdf';
+    const command = (format == 'docx') ? 'pandoc' : 'typst';
+    const args = (format == 'docx')
+        ? ['--from', 'typst', '--to', 'docx', '--output', '-', '-']
+        : ['compile', '--format', format, '-', '-'];
+    const process = await spawnCommand(command, args);
+    const [{ code, output, error }] = await Promise.all([
+        process.waitRead('binary', { throwOnNonZeroExitCode: false }),
+        process.write(source),
+    ]);
+    const errorString = decodeText(error);
+    if (code !== 0) {
+        throw new Error(`
+Typst compilation failed with exit code ${code}.\n
+Error Output:\n${errorString}
+`.trim());
+    }
+    return output;
+}