@ya-accelerators/web-backend-framework 0.0.142 → 0.0.144

package/dist/server/trpc/index.d.ts

@@ -1,4 +1,4 @@
-import { type AnyTRPCProcedure, type AnyTRPCRouter } from '@trpc/server';
+import { type AnyTRPCProcedure, type AnyTRPCRouter, TRPCError } from '@trpc/server';
 import * as trpcExpress from '@trpc/server/adapters/express';
 import type express from 'express';
 import superjson from 'superjson';
@@ -29,8 +29,8 @@ export declare function generator<TContext extends object = EmptyObject, TRopaKe
     ip: string | undefined;
 } & TContext ? T extends (...args: any[]) => object | Promise<object> ? import("@trpc/server").TRPCUnwrap<T> : T : never : never, object, {
     transformer: typeof superjson;
-    errorFormatter({ error, type, path, input, shape }: {
-        error: import("@trpc/server").TRPCError;
+    errorFormatter: ({ error, type, path, input, shape }: {
+        error: TRPCError;
         type: import("@trpc/server").ProcedureType | 'unknown';
         path: string | undefined;
         input: unknown;
@@ -42,7 +42,7 @@ export declare function generator<TContext extends object = EmptyObject, TRopaKe
             ip: string | undefined;
         } & TContext ? T_1 extends (...args: any[]) => object | Promise<object> ? import("@trpc/server").TRPCUnwrap<T_1> : T_1 : never : never) | undefined;
         shape: import("@trpc/server").TRPCDefaultErrorShape;
-    }): {
+    }) => {
         code: import("@trpc/server").TRPC_ERROR_CODE_NUMBER;
         message: string;
         data: {
@@ -185,8 +185,8 @@ export declare function generator<TContext extends object = EmptyObject, TRopaKe
     ip: string | undefined;
 } & TContext ? T extends (...args: any[]) => object | Promise<object> ? import("@trpc/server").TRPCUnwrap<T> : T : never : never, object, {
     transformer: typeof superjson;
-    errorFormatter({ error, type, path, input, shape }: {
-        error: import("@trpc/server").TRPCError;
+    errorFormatter: ({ error, type, path, input, shape }: {
+        error: TRPCError;
         type: import("@trpc/server").ProcedureType | 'unknown';
         path: string | undefined;
         input: unknown;
@@ -198,7 +198,7 @@ export declare function generator<TContext extends object = EmptyObject, TRopaKe
             ip: string | undefined;
         } & TContext ? T_1 extends (...args: any[]) => object | Promise<object> ? import("@trpc/server").TRPCUnwrap<T_1> : T_1 : never : never) | undefined;
         shape: import("@trpc/server").TRPCDefaultErrorShape;
-    }): {
+    }) => {
         code: import("@trpc/server").TRPC_ERROR_CODE_NUMBER;
         message: string;
         data: {

package/dist/server/trpc/index.js

@@ -1,5 +1,5 @@
 import { TRPCClientError } from '@trpc/client';
-import { initTRPC } from '@trpc/server';
+import { initTRPC, TRPCError } from '@trpc/server';
 import * as trpcExpress from '@trpc/server/adapters/express';
 import superjson from 'superjson';
 import { constants } from '../../constants.js';
@@ -18,11 +18,24 @@ const createRequestContext = ({ req }) => {
         ip: req.ip,
     };
 };
+const relayedCodes = [
+    'UNAUTHORIZED',
+    'BAD_REQUEST',
+    'PAYMENT_REQUIRED',
+    'FORBIDDEN',
+    'NOT_FOUND',
+    'PRECONDITION_FAILED',
+    'PRECONDITION_REQUIRED',
+    'UNSUPPORTED_MEDIA_TYPE',
+    'UNPROCESSABLE_CONTENT',
+    'TOO_MANY_REQUESTS',
+];
+const isRelayableCode = (code) => relayedCodes.some((relayed) => relayed === code);
 export function* generator(options = {}) {
     const { customRoutes, resolveAuditActor } = options;
     const tprc = initTRPC.context().create({
         transformer: superjson,
-        errorFormatter({ error, type, path, input, shape }) {
+        errorFormatter: ({ error, type, path, input, shape }) => {
             const isDevelopment = defaultEnv.NODE_ENV === 'development';
             const source = isDevelopment &&
                 error.cause &&
@@ -71,7 +84,18 @@ export function* generator(options = {}) {
                 ctx.startTime = startTime;
                 const result = await next();
                 if (typeof result === 'object' && result !== null && 'error' in result && result.error instanceof Error) {
-                    throw result.error;
+                    // tRPC wraps a downstream service's `TRPCClientError` as INTERNAL_SERVER_ERROR. A downstream code the
+                    // framework's own `throw*Error` helpers raise is answered with that code and message, and the cause is
+                    // kept because `onError` reads its source.
+                    const downstream = result.error instanceof TRPCError &&
+                        result.error.code === 'INTERNAL_SERVER_ERROR' &&
+                        result.error.cause instanceof TRPCClientError
+                        ? result.error.cause
+                        : undefined;
+                    const code = downstream?.data?.code;
+                    throw downstream !== undefined && isRelayableCode(code)
+                        ? new TRPCError({ code, message: downstream.message, cause: downstream })
+                        : result.error;
                 }
                 logger.debug('operation', { type, duration: Date.now() - startTime });
                 return result;
@@ -89,9 +113,6 @@ export function* generator(options = {}) {
         windowSec: constants.ERROR_LOG_RATE_LIMIT_WINDOW_SEC,
     };
     let routerBuilt = false;
-    const uploadHandler = async () => {
-        return mint(uploadBucket ?? throwForbiddenError('file upload is not configured for this service'));
-    };
     const baseRouter = tprc.router.bind(tprc);
     const wrappedRouter = (routes) => {
         if ('file' in routes) {
@@ -105,7 +126,9 @@ export function* generator(options = {}) {
             ...routes,
             file: {
                 upload: (uploadProcedure ??
-                    declarableProcedure.declare()).mutation(uploadHandler),
+                    declarableProcedure.declare()).mutation(async () => {
+                    return mint(uploadBucket ?? throwForbiddenError('file upload is not configured for this service'));
+                }),
             },
             errorLog: {
                 report: (errorLogProcedure ??
@@ -166,8 +189,8 @@ export function* generator(options = {}) {
                         : undefined;
                     // `inputKeys` instead of `input`, and no `result` / `headers`: which fields were present is what
                     // diagnoses a failed call, while their values are the payload this must not emit (see the
-                    // `operation` log above for why key-based redaction cannot be relied on here). A validation
-                    // failure already names the offending field in `message`.
+                    // `inputKeys` comment in `errorFormatter` above for why key-based redaction cannot be relied on
+                    // here). A validation failure already names the offending field in `message`.
                     logger.error('trpc', {
                         sequence: ctx && 'sequence' in ctx ? ctx.sequence : undefined,
                         type,

package/dist/server/trpc/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/trpc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAA6C,QAAQ,EAAE,MAAM,cAAc,CAAA;AAClF,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAA;AAE5D,OAAO,SAAS,MAAM,WAAW,CAAA;AAEjC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAA;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAE1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAElE,MAAM,oBAAoB,GAAG,CAAC,EAAE,GAAG,EAA2C,EAAE,EAAE;IAChF,OAAO;QACL,cAAc,EAAE,GAAG,CAAC,OAAO;QAC3B,EAAE,EAAE,GAAG,CAAC,EAAE;KACX,CAAA;AACH,CAAC,CAAA;AAKD,MAAM,SAAS,CAAC,CAAC,SAAS,CACxB,OAAO,GAGH,EAAE;IAEN,MAAM,EAAE,YAAY,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAA;IACnD,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAA6B,CAAC,MAAM,CAAC;QAChE,WAAW,EAAE,SAAS;QACtB,cAAc,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE;YAChD,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,KAAK,aAAa,CAAA;YAC3D,MAAM,MAAM,GACV,aAAa;gBACb,KAAK,CAAC,KAAK;gBACX,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ;gBAC/B,QAAQ,IAAI,KAAK,CAAC,KAAK;gBACvB,KAAK,CAAC,KAAK,CAAC,MAAM,YAAY,KAAK;gBACjC,CAAC,CAAC;oBACE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI;oBAC7B,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO;oBACnC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;iBAChC;gBACH,CAAC,CAAC,SAAS,CAAA;YACf,uFAAuF;YACvF,uFAAuF;YACvF,sFAAsF;YACtF,+CAA+C;YAC/C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,KAAK,uBAAuB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAA;YAClH,kGAAkG;YAClG,qGAAqG;YACrG,qGAAqG;YACrG,qGAAqG;YACrG,sGAAsG;YACtG,OAAO;gBACL,GAAG,KAAK;gBACR,OAAO;gBACP,IAAI,EAAE;oBACJ,IAAI,EAAE,UAAU,CAAC,OAAO;oBACxB,IAAI;oBACJ,IAAI;oBACJ,SAAS,EAAE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;oBACvF,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,OAAO;oBACP,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC9B;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;QAC3E,OAAO,iBAAiB,CACtB;YACE,WAAW,EAAE,CAAC,iBAAiB;gBAC7B,CAAC,CAAC,MAAM,iBAAiB,CAAC,GAAgC,CAAC;gBAC3D,CAAC,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,CAC7B,CAAC,WAAW;SACd,EACD,KAAK,IAAI,EAAE;YACT,OAAO,MAAM,kBAAkB,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE;gBAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAC3B;gBAAC,GAA0D,CAAC,SAAS,GAAG,SAAS,CAAA;gBAClF,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAA;gBAC3B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,YAAY,KAAK,EAAE,CAAC;oBACxG,MAAM,MAAM,CAAC,KAAK,CAAA;gBACpB,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,EAAE,CAAC,CAAA;gBACrE,OAAO,MAAM,CAAA;YACf,CAAC,CAAC,CAAA;QACJ,CAAC,CACF,CAAA;IACH,CAAC,CAAC,CAAA;IACF,MAAM,mBAAmB,GAAwD;QAC/E,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa;KAC7B,CAAA;IACD,IAAI,eAA4C,CAAA;IAChD,IAAI,YAAgC,CAAA;IACpC,IAAI,iBAAmD,CAAA;IACvD,IAAI,eAAe,GAAG;QACpB,GAAG,EAAE,SAAS,CAAC,wBAAwB;QACvC,SAAS,EAAE,SAAS,CAAC,+BAA+B;KACrD,CAAA;IACD,IAAI,WAAW,GAAG,KAAK,CAAA;IACvB,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;QAC/B,OAAO,IAAI,CAAC,YAAY,IAAI,mBAAmB,CAAC,gDAAgD,CAAC,CAAC,CAAA;IACpG,CAAC,CAAA;IACD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACzC,MAAM,aAAa,GAAG,CAA6C,MAAS,EAAE,EAAE;QAC9E,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAA;QAC1F,CAAC;QACD,IAAI,UAAU,IAAI,MAAM,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAA;QACpG,CAAC;QACD,WAAW,GAAG,IAAI,CAAA;QAClB,OAAO,UAAU,CAAC;YAChB,GAAG,MAAM;YACT,IAAI,EAAE;gBACJ,MAAM,EAAE,CACN,eAAe;oBACf,mBAAmB,CAAC,OAAO,EAGxB,CACJ,CAAC,QAAQ,CAAC,aAAa,CAAC;aAC1B;YACD,QAAQ,EAAE;gBACR,MAAM,EAAE,CACN,iBAAiB;oBACjB,mBAAmB,CAAC,OAAO,EAGxB,CACJ;qBACE,KAAK,CAAC,mBAAmB,CAAC;qBAC1B,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;oBACtB,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;wBACpC,mBAAmB,CAAC,2DAA2D,CAAC,CAAA;oBAClF,CAAC;oBACD,OAAO,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;gBACvC,CAAC,CAAC;aACL;SACF,CAAC,CAAA;IACJ,CAAC,CAAA;IACD,MAAM,YAAY,GAAG,IAKpB,CAAA;IACD,YAAY,CAAC,SAAS,GAAG,mBAAmB,CAAA;IAC5C,YAAY,CAAC,MAAM,GAAG,aAAa,CAAA;IACnC,YAAY,CAAC,eAAe,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE;QACnD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAA;QACrF,CAAC;QACD,eAAe,GAAG,SAAS,CAAA;QAC3B,YAAY,GAAG,MAAM,CAAA;IACvB,CAAC,CAAA;IACD,YAAY,CAAC,iBAAiB,GAAG,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE;QACtE,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAA;QACvF,CAAC;QACD,iBAAiB,GAAG,SAAS,CAAA;QAC7B,eAAe,GAAG;YAChB,GAAG,EAAE,GAAG,IAAI,SAAS,CAAC,wBAAwB;YAC9C,SAAS,EAAE,SAAS,IAAI,SAAS,CAAC,+BAA+B;SAClE,CAAA;IACH,CAAC,CAAA;IAED,MAAM,MAAM,GAAkB,MAAM,YAAY,CAAA;IAChD,SAAS,CAAC;QACR,YAAY;QACZ,cAAc,EAAE,eAAe,KAAK,SAAS;QAC7C,WAAW,EAAE;YACX,WAAW,CAAC,uBAAuB,CAAC;gBAClC,MAAM;gBACN,mBAAmB,EAAE,IAAI;gBACzB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;gBAC3E,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE;oBAC7C,8FAA8F;oBAC9F,6FAA6F;oBAC7F,0FAA0F;oBAC1F,MAAM,cAAc,GAAG,CAAC,MAAe,EAAE,EAAE,CACzC,OAAO,MAAM,KAAK,QAAQ;wBAC1B,MAAM,KAAK,IAAI;wBACf,QAAQ,IAAI,MAAM;wBAClB,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ;wBACjC,MAAM,CAAC,MAAM,KAAK,IAAI;wBACtB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC;wBACnC,CAAC,CAAC,MAAM,CAAC,MAAM;wBACf,CAAC,CAAC,SAAS,CAAA;oBACf,MAAM,gBAAgB,GACpB,KAAK,CAAC,KAAK,YAAY,eAAe;wBACpC,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBAC1E,CAAC,CAAC,SAAS,CAAA;oBAEf,iGAAiG;oBACjG,0FAA0F;oBAC1F,4FAA4F;oBAC5F,0DAA0D;oBAC1D,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE;wBACnB,QAAQ,EAAE,GAAG,IAAI,UAAU,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;wBAC7D,IAAI;wBACJ,IAAI;wBACJ,SAAS,EAAE,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;wBACvF,QAAQ,EACN,GAAG,IAAI,WAAW,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;wBACzG,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,KAAK,EAAE,KAAK,CAAC,KAAK;wBAClB,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAClD,CAAC,CAAA;gBACJ,CAAC;aACF,CAAC;SACH;KACF,CAAC,CAAA;IACF,OAAO,YAAY,CAAA;AACrB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/trpc/index.ts"],"names":[],"mappings":"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"}

package/dist/server/trpc/schema/index.d.ts

@@ -4,10 +4,6 @@ export declare const EmailSchema: z.ZodString;
 export declare const PasswordCharactersSchema: z.ZodString;
 export declare const PasswordSchema: z.ZodString;
 export declare const PhoneE164Schema: z.ZodString;
-export declare const JapanesePhoneNumberSchema: z.ZodString;
-export declare const JapaneseCorporateIdSchema: z.ZodString;
-export declare const JapaneseInvoiceNumberSchema: z.ZodString;
-export declare const JapaneseZipCodeSchema: z.ZodString;
 export declare const CurrencyCodeSchema: z.ZodString;
 export declare const CountryCodeSchema: z.ZodString;
 export declare const FileSchema: <const T extends readonly [string, ...string[]]>(accept: T, options?: {

package/dist/server/trpc/schema/index.js

@@ -14,18 +14,6 @@ export const PasswordSchema = z
 export const PhoneE164Schema = z
     .string()
     .refine((val) => Util.isValidPhoneE164(val), { message: 'Invalid phone number format.' });
-export const JapanesePhoneNumberSchema = z
-    .string()
-    .refine((val) => Util.isValidJapanesePhoneNumber(val), { message: 'Invalid Japanese phone number format.' });
-export const JapaneseCorporateIdSchema = z
-    .string()
-    .refine((val) => Util.isValidJapaneseCorporateId(val), { message: 'Invalid Japanese corporate ID format.' });
-export const JapaneseInvoiceNumberSchema = z
-    .string()
-    .refine((val) => Util.isValidInvoiceNumber(val), { message: 'Invalid invoice number format.' });
-export const JapaneseZipCodeSchema = z
-    .string()
-    .refine((val) => Util.isValidJapaneseZipCode(val), { message: 'Invalid Japanese zip code format.' });
 const CURRENCY_CODES = new Set(Intl.supportedValuesOf('currency'));
 export const CurrencyCodeSchema = z
     .string()

package/dist/server/trpc/schema/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/trpc/schema/index.ts"],"names":[],"mappings":"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;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;CACL,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC;KAC/B,MAAM,EAAE;KACR,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,6CAA6C,EAAE,CAAC,CAAA;AAExG,MAAM,CAAC,MAAM,UAAU,GAAG,CAAiD,MAAS,EAAE,OAA8B,EAAE,EAAE,CACtH,CAAC,CAAC,MAAM,CAAC;IACP,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC;IACvC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,iGAAiG;IACjG,kEAAkE;IAClE,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAEhC;IACtC,IAAI,EACF,OAAO,EAAE,OAAO,KAAK,SAAS;QAC5B,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE;QAChC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC;CAC1D,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/trpc/schema/index.ts"],"names":[],"mappings":"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ACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;IACJ,IAAI;CACL,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC;KAC/B,MAAM,EAAE;KACR,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,6CAA6C,EAAE,CAAC,CAAA;AAExG,MAAM,CAAC,MAAM,UAAU,GAAG,CAAiD,MAAS,EAAE,OAA8B,EAAE,EAAE,CACtH,CAAC,CAAC,MAAM,CAAC;IACP,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC;IACvC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,iGAAiG;IACjG,kEAAkE;IAClE,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAEhC;IACtC,IAAI,EACF,OAAO,EAAE,OAAO,KAAK,SAAS;QAC5B,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE;QAChC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC;CAC1D,CAAC,CAAA"}

package/dist/server/uploads/index.js

@@ -12,18 +12,6 @@ const tokenKey = (token) => `uploadtoken:${token}`;
 const digestActor = (actorSalt, actorUserId) => createHash('sha256')
     .update(JSON.stringify([actorSalt, actorUserId]))
     .digest('hex');
-const bindActor = (actorUserId) => {
-    const actorSalt = Util.createOTP(constants.UPLOAD_ACTOR_SALT_LENGTH, false);
-    return `${actorSalt}:${digestActor(actorSalt, actorUserId)}`;
-};
-const matchesActorBinding = (binding, actorUserId) => {
-    const separator = binding.indexOf(':');
-    if (separator === -1) {
-        return binding === createHash('sha256').update(actorUserId).digest('hex');
-    }
-    const actorSalt = binding.slice(0, separator);
-    return binding.slice(separator + 1) === digestActor(actorSalt, actorUserId);
-};
 export const mint = async (bucket) => {
     const { allowed } = await coordination.rateLimit.attempt({
         key: `file-upload:mint:${defaultEnv.SERVICE}`,
@@ -35,10 +23,12 @@ export const mint = async (bucket) => {
     }
     const token = Util.createOTP(constants.UPLOAD_TOKEN_LENGTH, false);
     const actorUserId = getCurrentAuditContext()?.actorUserId;
-    await redis.set(tokenKey(token), JSON.stringify({
-        bucket,
-        ...(actorUserId === undefined ? {} : { actorUserIdHash: bindActor(actorUserId) }),
-    }), constants.UPLOAD_TOKEN_TTL_SEC);
+    const tokenValue = { bucket };
+    if (actorUserId !== undefined) {
+        const actorSalt = Util.createOTP(constants.UPLOAD_ACTOR_SALT_LENGTH, false);
+        tokenValue.actorUserIdHash = `${actorSalt}:${digestActor(actorSalt, actorUserId)}`;
+    }
+    await redis.set(tokenKey(token), JSON.stringify(tokenValue), constants.UPLOAD_TOKEN_TTL_SEC);
     return { token, url: `${defaultEnv.BASE_URL}${constants.UPLOADS_PATH}` };
 };
 export const claimUploadToken = async (token) => {
@@ -118,10 +108,18 @@ export const consume = async (key, bucket, constraints) => {
     const actorUserId = getCurrentAuditContext()?.actorUserId;
     if (actorUserId === undefined
         ? object.metadata?.uploaderactorid !== undefined
-        : object.metadata?.uploaderactorid === undefined ||
-            !matchesActorBinding(object.metadata?.uploaderactorid, actorUserId)) {
+        : object.metadata?.uploaderactorid === undefined) {
         return undefined;
     }
+    if (actorUserId !== undefined && object.metadata?.uploaderactorid !== undefined) {
+        const separator = object.metadata.uploaderactorid.indexOf(':');
+        if (separator === -1
+            ? object.metadata.uploaderactorid !== createHash('sha256').update(actorUserId).digest('hex')
+            : object.metadata.uploaderactorid.slice(separator + 1) !==
+                digestActor(object.metadata.uploaderactorid.slice(0, separator), actorUserId)) {
+            return undefined;
+        }
+    }
     await s3.deleteObject({ bucket, key: objectKey });
     const declaredMimeType = normaliseContentType(object.metadata?.declaredcontenttype ?? object.contentType ?? constants.UPLOAD_STORED_CONTENT_TYPE);
     if (constraints?.maxSize !== undefined && object.body.length > constraints.maxSize) {

package/dist/server/uploads/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/uploads/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/server/uploads/index.ts"],"names":[],"mappings":"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"}

package/dist/util/index.d.ts

@@ -18,10 +18,6 @@ export declare const Util: {
     isValidPasswordCharacters: (value?: string) => boolean;
     isValidPassword: (value?: string) => boolean;
     isValidPhoneE164: (value?: string) => boolean;
-    isValidJapanesePhoneNumber: (value?: string) => boolean;
-    isValidJapaneseCorporateId: (value?: string) => boolean;
-    isValidInvoiceNumber: (value?: string) => boolean;
-    isValidJapaneseZipCode: (value?: string) => boolean;
     createOTP: (n: number, isNumberOnly: boolean) => string;
     createULID: typeof ulid;
     getHeaderValue: (headers: IncomingHttpHeaders | Record<string, string | string[] | undefined>, name: string) => string | undefined;

package/dist/util/index.js

@@ -12,7 +12,6 @@ export const Util = {
         const shouldRedactKey = (key, keywords) => keywords.some((kw) => normalizeKey(key) === kw || normalizeKey(key).includes(kw)) ||
             constants.SANITIZE_EXACT_KEYS.some((kw) => normalizeKey(key) === kw) ||
             consumerSanitizeKeys.exactKeys.some((kw) => normalizeKey(key) === kw);
-        const maybeTruncate = (s, max) => !max || max <= 0 ? s : s.length <= max ? s : `${s.slice(0, max)}...<truncated>`;
         const toJsonLikeSeen = new WeakSet();
         // Objects produced from an Error: their `name` is the error class (not PII), exempt from the
         // exact-match 'name' redaction in `walk`.
@@ -163,106 +162,8 @@ export const Util = {
         // disjoint, so keeper work sums over the string once rather than once per opener. Third, the keeper
         // quantifiers are bounded, so backtracking is capped per start position within a segment.
         const driverOpener = /Duplicate entry '?|Incorrect (\w+) value: '?|( - )?parameters:/g;
-        const driverKeyKeeper = / for key '[A-Za-z0-9_$.-]{1,192}'/g;
-        const driverColumnKeeper = / for column '[A-Za-z0-9_$.-]{1,192}'(?: at row \d{1,9}(?!\d))?/g;
-        const INCORRECT_VALUE_TYPES = [
-            'string',
-            'integer',
-            'decimal',
-            'double',
-            'float',
-            'datetime',
-            'date',
-            'time',
-            'timestamp',
-            'year',
-            'bit',
-            'boolean',
-            'json',
-            'char',
-            'binary',
-        ];
-        const lastKeeperIn = (segment, keeper) => {
-            keeper.lastIndex = 0;
-            let found = '';
-            for (let m = keeper.exec(segment); m !== null; m = keeper.exec(segment)) {
-                found = m[0];
-            }
-            return found;
-        };
-        const maskDriverValues = (text) => {
-            const openers = [];
-            driverOpener.lastIndex = 0;
-            for (let m = driverOpener.exec(text); m !== null; m = driverOpener.exec(text)) {
-                const [matched, valueType, paramsLead] = m;
-                const terminal = matched.endsWith('parameters:');
-                openers.push({
-                    start: m.index,
-                    end: m.index + matched.length,
-                    canonical: terminal
-                        ? `${paramsLead ?? ''}parameters:[***]`
-                        : valueType === undefined
-                            ? "Duplicate entry '***'"
-                            : INCORRECT_VALUE_TYPES.some((type) => type === valueType.toLowerCase())
-                                ? `Incorrect ${valueType} value: '***'`
-                                : "Incorrect value: '***'",
-                    terminal,
-                    keeper: valueType === undefined ? driverKeyKeeper : driverColumnKeeper,
-                });
-                if (terminal) {
-                    break;
-                }
-            }
-            if (openers.length === 0) {
-                return text;
-            }
-            let out = text.slice(0, openers[0].start);
-            for (const [i, opener] of openers.entries()) {
-                out += opener.canonical;
-                if (opener.terminal) {
-                    break;
-                }
-                out += lastKeeperIn(text.slice(opener.end, i + 1 < openers.length ? openers[i + 1].start : text.length), opener.keeper);
-            }
-            return out;
-        };
-        const maskInText = (text) => maskDriverValues(text)
-            .replace(/(\bpassword\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
-            .replace(/(\bpasswd\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
-            .replace(/(\bauthorization\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
-            .replace(/(\bproxy-authorization\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
-            .replace(/(\bcookie\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
-            .replace(/(\bset-cookie\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
-            .replace(/(\btoken\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
-            .replace(/(\bsecret\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
-            // key=value form (URL query string / form body): secrets in a logged `req.url` or error text.
-            // `id_token` / `session_state` / `jwt` are listed explicitly: the `\btoken` branch cannot reach
-            // the `token` inside `id_token` (the `_t` seam is word/word, so `\b` does not match there), and
-            // an OIDC id_token is a PII-bearing JWT that must not survive into logs.
-            .replace(/(\b(?:password|passwd|token|id_token|access_token|refresh_token|secret|api_key|apikey|api-key|authorization|session_state|session|jwt)=)[^&\s"'#]+/gi, '$1***')
-            .replace(/(\bBearer\s+)[\w.~+/-]+=*/gi, '$1***');
         const keywords = [...(options?.keywords ?? constants.SANITIZE_KEYWORDS), ...consumerSanitizeKeys.keywords];
         const seen = new WeakSet();
-        // A logged string carrying embedded newlines — a JSON-encoded error message (Zod issues), a
-        // stack trace, any multi-line text — renders as escaped `\n` once the record is JSON.stringified
-        // for output. Turn it into real structure so the log stays readable: parse it when it is itself
-        // a JSON object/array, otherwise split it on its lines. Single-line strings are returned as-is.
-        const expandMultiline = (s) => {
-            if (!s.includes('\n')) {
-                return s;
-            }
-            const trimmed = s.trim();
-            if (trimmed[0] === '{' || trimmed[0] === '[') {
-                try {
-                    const parsed = JSON.parse(trimmed);
-                    if (parsed !== null && typeof parsed === 'object') {
-                        return parsed;
-                    }
-                }
-                catch { }
-            }
-            return s.split('\n');
-        };
         const walk = (value, keyHint) => {
             if (value === null) {
                 return null;
@@ -274,15 +175,101 @@ export const Util = {
                 if (keyHint && shouldRedactKey(keyHint, keywords)) {
                     return '***';
                 }
+                const openers = [];
+                driverOpener.lastIndex = 0;
+                for (let m = driverOpener.exec(value); m !== null; m = driverOpener.exec(value)) {
+                    const [matched, valueType, paramsLead] = m;
+                    const terminal = matched.endsWith('parameters:');
+                    openers.push({
+                        start: m.index,
+                        end: m.index + matched.length,
+                        canonical: terminal
+                            ? `${paramsLead ?? ''}parameters:[***]`
+                            : valueType === undefined
+                                ? "Duplicate entry '***'"
+                                : [
+                                    'string',
+                                    'integer',
+                                    'decimal',
+                                    'double',
+                                    'float',
+                                    'datetime',
+                                    'date',
+                                    'time',
+                                    'timestamp',
+                                    'year',
+                                    'bit',
+                                    'boolean',
+                                    'json',
+                                    'char',
+                                    'binary',
+                                ].some((type) => type === valueType.toLowerCase())
+                                    ? `Incorrect ${valueType} value: '***'`
+                                    : "Incorrect value: '***'",
+                        terminal,
+                        keeper: valueType === undefined
+                            ? / for key '[A-Za-z0-9_$.-]{1,192}'/g
+                            : / for column '[A-Za-z0-9_$.-]{1,192}'(?: at row \d{1,9}(?!\d))?/g,
+                    });
+                    if (terminal) {
+                        break;
+                    }
+                }
+                let driverMasked = value;
+                if (openers.length > 0) {
+                    driverMasked = value.slice(0, openers[0].start);
+                    for (const [i, opener] of openers.entries()) {
+                        driverMasked += opener.canonical;
+                        if (opener.terminal) {
+                            break;
+                        }
+                        const segment = value.slice(opener.end, i + 1 < openers.length ? openers[i + 1].start : value.length);
+                        let found = '';
+                        for (let m = opener.keeper.exec(segment); m !== null; m = opener.keeper.exec(segment)) {
+                            found = m[0];
+                        }
+                        driverMasked += found;
+                    }
+                }
                 // Masked before the split, because the redacted span runs to the end of the whole message.
                 // Splitting first makes each line a message of its own, so the tail of a value carrying a
                 // newline lands on a line holding no marker and is emitted verbatim.
-                const masked = maskInText(value);
-                const expanded = expandMultiline(masked);
-                if (expanded !== masked) {
-                    return walk(expanded);
+                const masked = driverMasked
+                    .replace(/(\bpassword\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
+                    .replace(/(\bpasswd\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
+                    .replace(/(\bauthorization\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
+                    .replace(/(\bproxy-authorization\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
+                    .replace(/(\bcookie\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
+                    .replace(/(\bset-cookie\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
+                    .replace(/(\btoken\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
+                    .replace(/(\bsecret\b\s*:\s*)"(?:[^"\\]|\\.)*"/gi, '$1"***"')
+                    // key=value form (URL query string / form body): secrets in a logged `req.url` or error text.
+                    // `id_token` / `session_state` / `jwt` are listed explicitly: the `\btoken` branch cannot reach
+                    // the `token` inside `id_token` (the `_t` seam is word/word, so `\b` does not match there), and
+                    // an OIDC id_token is a PII-bearing JWT that must not survive into logs.
+                    .replace(/(\b(?:password|passwd|token|id_token|access_token|refresh_token|secret|api_key|apikey|api-key|authorization|session_state|session|jwt)=)[^&\s"'#]+/gi, '$1***')
+                    .replace(/(\bBearer\s+)[\w.~+/-]+=*/gi, '$1***');
+                // A logged string carrying embedded newlines — a JSON-encoded error message (Zod issues), a
+                // stack trace, any multi-line text — renders as escaped `\n` once the record is JSON.stringified
+                // for output. Turn it into real structure so the log stays readable: parse it when it is itself
+                // a JSON object/array, otherwise split it on its lines. A single-line string goes on to the length cap below.
+                if (masked.includes('\n')) {
+                    const trimmed = masked.trim();
+                    if (trimmed[0] === '{' || trimmed[0] === '[') {
+                        let parsed;
+                        try {
+                            parsed = JSON.parse(trimmed);
+                        }
+                        catch { }
+                        if (parsed !== null && typeof parsed === 'object') {
+                            return walk(parsed);
+                        }
+                    }
+                    return walk(masked.split('\n'));
                 }
-                return maybeTruncate(masked, options?.maxStringLength);
+                return options?.maxStringLength && options.maxStringLength > 0 && masked.length > options.maxStringLength
+                    ? `${masked.slice(0, options.maxStringLength)}...<truncated>`
+                    : masked;
             }
             if (typeof value === 'number') {
                 return Number.isFinite(value) ? value : String(value);
@@ -361,10 +348,6 @@ export const Util = {
         })
             .join(''))).test(value),
     isValidPhoneE164: (value) => value !== undefined && /^\+[1-9]\d{1,14}$/.test(value),
-    isValidJapanesePhoneNumber: (value) => value !== undefined && /^0\d{1,4}-\d{1,4}-\d{3,4}$/.test(value) && /^0\d{9,10}$/.test(value.replace(/-/g, '')),
-    isValidJapaneseCorporateId: (value) => (value === undefined ? false : /^[0-9]{13}$/.test(value)),
-    isValidInvoiceNumber: (value) => (value === undefined ? false : /^T[0-9]{13}$/.test(value)),
-    isValidJapaneseZipCode: (value) => (value === undefined ? false : /^\d{3}-?\d{4}$/.test(value)),
     createOTP: (n, isNumberOnly) => {
         const seed = isNumberOnly ? '0123456789' : 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
         const limit = 256 - (256 % seed.length);

package/dist/util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAG3B,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAEzE,MAAM,2BAA2B,GAC/B,0FAAmG,CAAA;AAErG,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,OAAO,EAAE,CAAI,UAA4B,EAAqB,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;IAC1F,QAAQ,EAAE,CAAC,GAAY,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;IACnE,QAAQ,EAAE,CAAC,GAAY,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ;IACnD,SAAS,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE;IACxD,QAAQ,EAAE,CACR,KAAQ,EACR,OAGC,EACD,EAAE;QACF,MAAM,YAAY,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;QAC1D,MAAM,eAAe,GAAG,CAAC,GAAW,EAAE,QAA2B,EAAE,EAAE,CACnE,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACjF,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;YACpE,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAA;QACvE,MAAM,cAAc,GAAG,IAAI,OAAO,EAAU,CAAA;QAC5C,6FAA6F;QAC7F,0CAA0C;QAC1C,MAAM,WAAW,GAAG,IAAI,OAAO,EAAU,CAAA;QACzC,MAAM,UAAU,GAAG,CAAC,CAAU,EAAW,EAAE;YACzC,0FAA0F;YAC1F,6FAA6F;YAC7F,mFAAmF;YACnF,IAAI,CAAC;gBACH,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;oBACf,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;oBACpB,OAAO,SAAS,CAAA;gBAClB,CAAC;gBACD,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;oBACtB,OAAO,CAAC,CAAC,WAAW,EAAE,CAAA;gBACxB,CAAC;gBACD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;oBAC1B,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAA;gBACrB,CAAC;gBACD,IAAI,CAAC,YAAY,UAAU,EAAE,CAAC;oBAC5B,OAAO,cAAc,CAAC,CAAC,UAAU,GAAG,CAAA;gBACtC,CAAC;gBACD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;oBAC1B,OAAO,CAAC,CAAA;gBACV,CAAC;gBACD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;oBAC1B,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;gBAC3C,CAAC;gBACD,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE,CAAC;oBAC3B,OAAO,CAAC,CAAA;gBACV,CAAC;gBACD,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;oBAC1B,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;gBAClB,CAAC;gBACD,IAAI,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1B,OAAO,YAAY,CAAA;gBACrB,CAAC;gBACD,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;gBACrB,IAAI,CAAC;oBACH,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;wBACvB,uFAAuF;wBACvF,wFAAwF;wBACxF,mFAAmF;wBACnF,MAAM,UAAU,GAA4B,EAAE,CAAA;wBAC9C,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;4BAC/B,IAAI,CAAC;gCACH,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAmB,CAAC,CAAC,CAAA;4BACpD,CAAC;4BAAC,MAAM,CAAC;gCACP,UAAU,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAA;4BACpC,CAAC;wBACH,CAAC;wBACD,IAAI,CAAC;4BACH,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAA;wBAC1B,CAAC;wBAAC,MAAM,CAAC;4BACP,UAAU,CAAC,IAAI,GAAG,kBAAkB,CAAA;wBACtC,CAAC;wBACD,IAAI,CAAC;4BACH,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAA;wBAChC,CAAC;wBAAC,MAAM,CAAC;4BACP,UAAU,CAAC,OAAO,GAAG,kBAAkB,CAAA;wBACzC,CAAC;wBACD,IAAI,CAAC;4BACH,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAA;wBAC5B,CAAC;wBAAC,MAAM,CAAC;4BACP,UAAU,CAAC,KAAK,GAAG,kBAAkB,CAAA;wBACvC,CAAC;wBACD,IAAI,CAAC;4BACH,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gCAC1B,UAAU,CAAC,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;4BACxC,CAAC;wBACH,CAAC;wBAAC,MAAM,CAAC;4BACP,UAAU,CAAC,KAAK,GAAG,kBAAkB,CAAA;wBACvC,CAAC;wBACD,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;wBAC3B,OAAO,UAAU,CAAA;oBACnB,CAAC;oBACD,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;wBACrB,MAAM,GAAG,GAA4B,EAAE,CAAA;wBACvC,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;4BACzB,IAAI,CAAC;gCACH,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAA;4BAClC,CAAC;4BAAC,MAAM,CAAC;gCACP,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,kBAAkB,CAAA;4BACtC,CAAC;wBACH,CAAC;wBACD,OAAO,GAAG,CAAA;oBACZ,CAAC;oBACD,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;wBACrB,MAAM,GAAG,GAAc,EAAE,CAAA;wBACzB,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;4BAClB,IAAI,CAAC;gCACH,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;4BACzB,CAAC;4BAAC,MAAM,CAAC;gCACP,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;4BAC9B,CAAC;wBACH,CAAC;wBACD,OAAO,GAAG,CAAA;oBACZ,CAAC;oBACD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;wBACrB,MAAM,GAAG,GAAc,EAAE,CAAA;wBACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;4BAClC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gCACd,GAAG,CAAC,MAAM,EAAE,CAAA;gCACZ,SAAQ;4BACV,CAAC;4BACD,IAAI,CAAC;gCACH,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;4BAC5B,CAAC;4BAAC,MAAM,CAAC;gCACP,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;4BAC9B,CAAC;wBACH,CAAC;wBACD,OAAO,GAAG,CAAA;oBACZ,CAAC;oBACD,MAAM,GAAG,GAA4B,EAAE,CAAA;oBACvC,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC/B,IAAI,CAAC;4BACH,GAAG,CAAC,CAAC,CAAC,GAAG,UAAU,CAAE,CAA6B,CAAC,CAAC,CAAC,CAAC,CAAA;wBACxD,CAAC;wBAAC,MAAM,CAAC;4BACP,GAAG,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAA;wBAC7B,CAAC;oBACH,CAAC;oBACD,OAAO,GAAG,CAAA;gBACZ,CAAC;wBAAS,CAAC;oBACT,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;gBAC1B,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,kBAAkB,CAAA;YAC3B,CAAC;QACH,CAAC,CAAA;QACD,yGAAyG;QACzG,wGAAwG;QACxG,uGAAuG;QACvG,wGAAwG;QACxG,yGAAyG;QACzG,oGAAoG;QACpG,0FAA0F;QAC1F,MAAM,YAAY,GAAG,iEAAiE,CAAA;QACtF,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,IAAI,SAAS,CAAC,iBAAiB,CAAC,EAAE,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAA;QAC1G,MAAM,IAAI,GAAG,IAAI,OAAO,EAAU,CAAA;QAClC,MAAM,IAAI,GAAG,CAAC,KAAc,EAAE,OAAgB,EAAW,EAAE;YACzD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,OAAO,IAAI,CAAA;YACb,CAAC;YACD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,OAAO,SAAS,CAAA;YAClB,CAAC;YACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,IAAI,OAAO,IAAI,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC;oBAClD,OAAO,KAAK,CAAA;gBACd,CAAC;gBACD,MAAM,OAAO,GAA2F,EAAE,CAAA;gBAC1G,YAAY,CAAC,SAAS,GAAG,CAAC,CAAA;gBAC1B,KAAK,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBAChF,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,CAAA;oBAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;oBAChD,OAAO,CAAC,IAAI,CAAC;wBACX,KAAK,EAAE,CAAC,CAAC,KAAK;wBACd,GAAG,EAAE,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM;wBAC7B,SAAS,EAAE,QAAQ;4BACjB,CAAC,CAAC,GAAG,UAAU,IAAI,EAAE,kBAAkB;4BACvC,CAAC,CAAC,SAAS,KAAK,SAAS;gCACvB,CAAC,CAAC,uBAAuB;gCACzB,CAAC,CAAC;oCACI,QAAQ;oCACR,SAAS;oCACT,SAAS;oCACT,QAAQ;oCACR,OAAO;oCACP,UAAU;oCACV,MAAM;oCACN,MAAM;oCACN,WAAW;oCACX,MAAM;oCACN,KAAK;oCACL,SAAS;oCACT,MAAM;oCACN,MAAM;oCACN,QAAQ;iCACT,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,WAAW,EAAE,CAAC;oCACpD,CAAC,CAAC,aAAa,SAAS,eAAe;oCACvC,CAAC,CAAC,wBAAwB;wBAChC,QAAQ;wBACR,MAAM,EACJ,SAAS,KAAK,SAAS;4BACrB,CAAC,CAAC,oCAAoC;4BACtC,CAAC,CAAC,iEAAiE;qBACxE,CAAC,CAAA;oBACF,IAAI,QAAQ,EAAE,CAAC;wBACb,MAAK;oBACP,CAAC;gBACH,CAAC;gBACD,IAAI,YAAY,GAAG,KAAK,CAAA;gBACxB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACvB,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;oBAC/C,KAAK,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;wBAC5C,YAAY,IAAI,MAAM,CAAC,SAAS,CAAA;wBAChC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;4BACpB,MAAK;wBACP,CAAC;wBACD,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;wBACrG,IAAI,KAAK,GAAG,EAAE,CAAA;wBACd,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;4BACtF,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;wBACd,CAAC;wBACD,YAAY,IAAI,KAAK,CAAA;oBACvB,CAAC;gBACH,CAAC;gBACD,2FAA2F;gBAC3F,0FAA0F;gBAC1F,qEAAqE;gBACrE,MAAM,MAAM,GAAG,YAAY;qBACxB,OAAO,CAAC,0CAA0C,EAAE,SAAS,CAAC;qBAC9D,OAAO,CAAC,wCAAwC,EAAE,SAAS,CAAC;qBAC5D,OAAO,CAAC,+CAA+C,EAAE,SAAS,CAAC;qBACnE,OAAO,CAAC,qDAAqD,EAAE,SAAS,CAAC;qBACzE,OAAO,CAAC,wCAAwC,EAAE,SAAS,CAAC;qBAC5D,OAAO,CAAC,4CAA4C,EAAE,SAAS,CAAC;qBAChE,OAAO,CAAC,uCAAuC,EAAE,SAAS,CAAC;qBAC3D,OAAO,CAAC,wCAAwC,EAAE,SAAS,CAAC;oBAC7D,8FAA8F;oBAC9F,gGAAgG;oBAChG,gGAAgG;oBAChG,yEAAyE;qBACxE,OAAO,CACN,sJAAsJ,EACtJ,OAAO,CACR;qBACA,OAAO,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAA;gBAClD,4FAA4F;gBAC5F,iGAAiG;gBACjG,gGAAgG;gBAChG,8GAA8G;gBAC9G,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC1B,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;oBAC7B,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;wBAC7C,IAAI,MAAe,CAAA;wBACnB,IAAI,CAAC;4BACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;wBAC9B,CAAC;wBAAC,MAAM,CAAC,CAAA,CAAC;wBACV,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;4BAClD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAA;wBACrB,CAAC;oBACH,CAAC;oBACD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;gBACjC,CAAC;gBACD,OAAO,OAAO,EAAE,eAAe,IAAI,OAAO,CAAC,eAAe,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,eAAe;oBACvG,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,gBAAgB;oBAC7D,CAAC,CAAC,MAAM,CAAA;YACZ,CAAC;YACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACvD,CAAC;YACD,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC/B,OAAO,KAAK,CAAA;YACd,CAAC;YACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;YACtB,CAAC;YAED,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBACpB,OAAO,YAAY,CAAA;YACrB,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YACf,IAAI,CAAC;gBACH,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;gBAClC,CAAC;gBACD,MAAM,GAAG,GAA4B,EAAE,CAAA;gBACvC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;oBACtE,IACE,eAAe,CAAC,CAAC,EAAE,QAAQ,CAAC;wBAC5B,CAAC,SAAS,CAAC,iCAAiC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;4BAC/E,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAC1B,CAAC;wBACD,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;wBACd,SAAQ;oBACV,CAAC;oBACD,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBACrB,CAAC;gBACD,OAAO,GAAG,CAAA;YACZ,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACpB,CAAC;QACH,CAAC,CAAA;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAM,CAAA;IACrC,CAAC;IACD,cAAc,EAAE,CAAC,CAMf,MAAe,EACf,QAAmB,EACnB,SAAgC,EAChC,MAAgB,EAChB,EAAE;QACF,IAAI,SAAS,GAA4B,IAAI,CAAA;QAC7C,IAAI,YAAY,GAA+B,IAAI,CAAA;QACnD,OAAO,IAAI,KAAK,CACd,EAAE,EACF;YACE,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;gBACrB,MAAM,GAAG,GAAG,CAAC,SAAS,KAAK,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAqB,CAAC,CAAA;gBACxE,IAAI,MAAM,EAAE,CAAC;oBACX,YAAY,KAAK,MAAM,CAAC,GAAG,CAAwB,CAAA;oBACnD,MAAM,QAAQ,GAAG,YAAgD,CAAA;oBACjE,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;wBACrB,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAA;oBACvB,CAAC;gBACH,CAAC;gBACD,OAAO,GAAG,CAAC,IAA8B,CAAC,CAAA;YAC5C,CAAC;SACF,CACF,CAAA;IACH,CAAC,CAgBA;IACD,YAAY,EAAE,CAAC,KAAc,EAAE,EAAE,CAC/B,KAAK,KAAK,SAAS;QACjB,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,0EAA0E,CAAC,IAAI,CAAC,KAAK,CAAC;IAC5F,yBAAyB,EAAE,CAAC,KAAc,EAAE,EAAE,CAC5C,KAAK,KAAK,SAAS,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,2BAA2B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC3F,eAAe,EAAE,CAAC,KAAc,EAAE,EAAE,CAClC,KAAK,KAAK,SAAS;QACjB,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAI,MAAM,CACR,uLAAuL,CAAC,UAAU,CAChM,WAAW,EACX,CAAC,GAAG,2BAA2B,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,QAAQ,CAAC,EAAE,CAAC;gBACV,KAAK,IAAI;oBACP,OAAO,MAAM,CAAA;gBACf,KAAK,GAAG;oBACN,OAAO,KAAK,CAAA;gBACd,KAAK,GAAG;oBACN,OAAO,KAAK,CAAA;gBACd,KAAK,GAAG;oBACN,OAAO,KAAK,CAAA;gBACd,KAAK,GAAG;oBACN,OAAO,KAAK,CAAA;gBACd;oBACE,OAAO,CAAC,CAAA;YACZ,CAAC;QACH,CAAC,CAAC;aACD,IAAI,CAAC,EAAE,CAAC,CACZ,CACF,CAAC,IAAI,CAAC,KAAK,CAAC;IACnB,gBAAgB,EAAE,CAAC,KAAc,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,IAAI,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC;IAC5F,SAAS,EAAE,CAAC,CAAS,EAAE,YAAqB,EAAE,EAAE;QAC9C,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,gEAAgE,CAAA;QAC3G,MAAM,KAAK,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAA;QACvC,MAAM,GAAG,GAAa,EAAE,CAAA;QACxB,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;gBAC1E,IAAI,IAAI,GAAG,KAAK,EAAE,CAAC;oBACjB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;gBACpC,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IACrB,CAAC;IACD,UAAU,EAAE,IAAI;IAChB,cAAc,EAAE,CAAC,OAA4E,EAAE,IAAY,EAAE,EAAE;QAC7G,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;QAC9B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAClH,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACvE,CAAC;QACD,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;IAC1E,CAAC;CACF,CAAA"}