prostgles-types 4.0.301 → 4.0.303

package/lib/files.ts

@@ -5,10 +5,22 @@ export const CONTENT_TYPE_TO_EXT = {
   "text/css": ["css"],
   "text/csv": ["csv"],
   "text/tsv": ["tsv"],
+  "text/tab-separated-values": ["tsv"],
   "text/xml": ["xml"],
   "text/mathml": ["mml"],
-  "text/plain": ["txt"],
-  "text/markdown": ["md", "markdown"],
+  "text/plain": ["txt", "text", "log"],
+  "text/markdown": ["md", "markdown", "qmd", "rmd"],
+  "text/x-markdown": ["md", "markdown"],
+  "text/asciidoc": ["adoc", "asciidoc", "asc"],
+  "text/x-asciidoc": ["adoc", "asciidoc", "asc"],
+  "text/x-tex": ["tex"],
+  "text/x-latex": ["tex", "latex"],
+  "text/rtf": ["rtf"],
+  "text/vtt": ["vtt"],
+  "text/calendar": ["ics", "ifb"],
+  "text/vcard": ["vcf", "vcard"],
+  "text/javascript": ["js", "mjs", "cjs"],
+  "text/yaml": ["yaml", "yml"],
   "text/vnd.sun.j2me.app-descriptor": ["jad"],
   "text/vnd.wap.wml": ["wml"],
   "text/x-component": ["htc"],
@@ -16,30 +28,81 @@ export const CONTENT_TYPE_TO_EXT = {
   "image/jpeg": ["jpeg", "jpg"],
   "image/png": ["png"],
   "image/tiff": ["tif", "tiff"],
+  "image/bmp": ["bmp"],
+  "image/avif": ["avif"],
+  "image/heic": ["heic"],
+  "image/heif": ["heif"],
   "image/vnd.wap.wbmp": ["wbmp"],
   "image/x-icon": ["ico"],
+  "image/vnd.microsoft.icon": ["ico"],
   "image/x-jng": ["jng"],
   "image/x-ms-bmp": ["bmp"],
   "image/svg+xml": ["svg"],
   "image/webp": ["webp"],
   "application/sql": ["sql"],
   "application/json": ["json"],
+  "application/xml": ["xml", "xsl", "xsd", "nxml", "xbrl", "dclg"],
+  "application/yaml": ["yaml", "yml"],
   "application/geo+json": ["geojson"],
+  "application/javascript": ["js", "mjs", "cjs"],
   "application/x-javascript": ["js"],
   "application/atom+xml": ["atom"],
   "application/rss+xml": ["rss"],
   "application/java-archive": ["jar", "war", "ear"],
   "application/mac-binhex40": ["hqx"],
-  "application/msword": ["doc", "docx"],
+  "application/msword": ["doc", "docx", "dot"],
+  "application/x-msword": ["doc", "dot"],
   "application/pdf": ["pdf"],
   "application/postscript": ["ps", "eps", "ai"],
   "application/rtf": ["rtf"],
-  "application/vnd.ms-excel": ["xls", "xlsx"],
-  "application/vnd.ms-powerpoint": ["ppt", "pptx"],
+  "application/x-rtf": ["rtf"],
+  "application/epub+zip": ["epub"],
+  "application/vnd.apple.pages": ["pages"],
+  "application/vnd.apple.numbers": ["numbers"],
+  "application/vnd.apple.keynote": ["key"],
+  "application/x-iwork-pages-sffpages": ["pages"],
+  "application/x-iwork-numbers-sffnumbers": ["numbers"],
+  "application/x-iwork-keynote-sffkey": ["key"],
+  "application/vnd.box.boxnote": ["boxnote"],
+  "application/vnd.ibm.modcap": ["afp"],
+  "application/x-afp": ["afp"],
+  "application/x-ebcdic": ["ebc", "ebcdic"],
+  "application/vnd.ms-excel": ["xls", "xlsx", "xlt"],
+  "application/x-msexcel": ["xls", "xlt"],
+  "application/vnd.ms-excel.sheet.macroenabled.12": ["xlsm"],
+  "application/vnd.ms-excel.sheet.binary.macroenabled.12": ["xlsb"],
+  "application/vnd.ms-excel.template.macroenabled.12": ["xltm"],
+  "application/vnd.ms-powerpoint": ["ppt", "pptx", "pot", "pps"],
+  "application/vnd.ms-powerpoint.presentation.macroenabled.12": ["pptm"],
+  "application/vnd.ms-powerpoint.template.macroenabled.12": ["potm"],
+  "application/vnd.ms-powerpoint.slideshow.macroenabled.12": ["ppsm"],
+  "application/vnd.ms-word.document.macroenabled.12": ["docm"],
+  "application/vnd.ms-word.template.macroenabled.12": ["dotm"],
+  "application/vnd.ms-outlook": ["msg"],
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document": ["docx"],
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.template": ["dotx"],
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": ["xlsx"],
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.template": ["xltx"],
+  "application/vnd.openxmlformats-officedocument.presentationml.presentation": ["pptx"],
+  "application/vnd.openxmlformats-officedocument.presentationml.template": ["potx"],
+  "application/vnd.openxmlformats-officedocument.presentationml.slideshow": ["ppsx"],
+  "application/vnd.oasis.opendocument.text": ["odt"],
+  "application/vnd.oasis.opendocument.text-template": ["ott"],
+  "application/vnd.oasis.opendocument.spreadsheet": ["ods"],
+  "application/vnd.oasis.opendocument.spreadsheet-template": ["ots"],
+  "application/vnd.oasis.opendocument.presentation": ["odp"],
+  "application/vnd.oasis.opendocument.presentation-template": ["otp"],
+  "application/vnd.oasis.opendocument.graphics": ["odg"],
   "application/vnd.wap.wmlc": ["wmlc"],
   "application/vnd.google-earth.kml+xml": ["kml"],
   "application/vnd.google-earth.kmz": ["kmz"],
   "application/x-7z-compressed": ["7z"],
+  "application/gzip": ["gz", "tgz"],
+  "application/x-tar": ["tar"],
+  "application/x-bzip2": ["bz2", "tbz2"],
+  "application/x-xz": ["xz"],
+  "application/zstd": ["zst"],
+  "application/vnd.rar": ["rar"],
   "application/x-cocoa": ["cco"],
   "application/x-java-archive-diff": ["jardiff"],
   "application/x-java-jnlp-file": ["jnlp"],
@@ -52,10 +115,13 @@ export const CONTENT_TYPE_TO_EXT = {
   "application/x-shockwave-flash": ["swf"],
   "application/x-stuffit": ["sit"],
   "application/x-tcl": ["tcl", "tk"],
+  "application/x-tex": ["tex"],
+  "application/x-latex": ["latex"],
+  "application/x-mimearchive": ["mhtml", "mht"],
   "application/x-x509-ca-cert": ["der", "pem", "crt"],
   "application/x-xpinstall": ["xpi"],
   "application/xhtml+xml": ["xhtml"],
-  "application/zip": ["zip"],
+  "application/zip": ["zip", "dclx"],
   "application/octet-stream": [
     "bin",
     "exe",
@@ -71,7 +137,19 @@ export const CONTENT_TYPE_TO_EXT = {
   ],
   "audio/midi": ["mid", "midi", "kar"],
   "audio/mpeg": ["mp3"],
-  "audio/ogg": ["ogg"],
+  "audio/mp3": ["mp3"],
+  "audio/mp4": ["m4a", "mp4a", "m4b"],
+  "audio/m4a": ["m4a"],
+  "audio/x-m4a": ["m4a"],
+  "audio/aac": ["aac", "adts"],
+  "audio/wav": ["wav"],
+  "audio/x-wav": ["wav"],
+  "audio/vnd.wave": ["wav"],
+  "audio/flac": ["flac"],
+  "audio/x-flac": ["flac"],
+  "audio/ogg": ["ogg", "oga", "opus", "spx"],
+  "audio/webm": ["weba"],
+  "audio/x-aiff": ["aif", "aiff", "aifc"],
   "audio/x-realaudio": ["ra"],
   "video/3gpp": ["3gpp", "3gp"],
   "video/mpeg": ["mpeg", "mpg"],
@@ -81,8 +159,13 @@ export const CONTENT_TYPE_TO_EXT = {
   "video/x-ms-asf": ["asx", "asf"],
   "video/x-ms-wmv": ["wmv"],
   "video/x-msvideo": ["avi"],
+  "video/avi": ["avi"],
+  "video/x-matroska": ["mkv"],
   "video/mp4": ["m4v", "mp4"],
   "video/webm": ["webm"],
+  "video/ogg": ["ogv"],
+  "message/rfc822": ["eml", "mime", "mht", "mhtml"],
+  "multipart/related": ["mhtml", "mht"],
 } as const;
 
 export type ALLOWED_CONTENT_TYPE = keyof typeof CONTENT_TYPE_TO_EXT;

package/lib/index.ts

@@ -563,9 +563,30 @@ export type JoinPath = {
    * {
    *    leftColumn: "rightColumn"
    * }
+   * A string selects a named, server-defined computed join.
    */
-  on?: Record<string, string>[];
+  on?: Record<string, string>[] | string;
+  /** Parameters validated against the server-defined computed join schema. */
+  params?: Record<string, unknown>;
+  /** Reverse a computed self-join; omitted for the declared direction. */
+  reversed?: boolean;
 };
+
+/** Published direct relationships. SQL implementations remain on the server. */
+export type ClientJoin = {
+  tables: [string, string];
+} & (
+  | {
+      on: Record<string, string>[];
+      supportsMultiHop: boolean;
+      paramsSchema?: never;
+    }
+  | {
+      on: string;
+      supportsMultiHop: boolean;
+      paramsSchema?: JSONB.ObjectType["type"];
+    }
+);
 /**
  * Can be either the target table name, or the sequence of tables to join through with the target table at the end.
  */
@@ -1641,6 +1662,7 @@ export type TableSchemaErrors = {
 export type ClientSchema = {
   rawSQL: boolean;
   joinTables: string[][];
+  joins: ClientJoin[];
   auth: AuthTypes.AuthSocketSchema | undefined;
   version: any;
   err?: string;

package/lib/joinHelpers.ts

@@ -1,8 +1,24 @@
-import type { AnyObject, DetailedJoinSelect, JoinMaker } from "./index";
+import type { AnyObject, DetailedJoinSelect, JoinMaker, JSONB } from "./index";
 import { omitKeys } from "./util";
 
 /** Preserve literal table names and selections for joined return type inference. */
-export const defineJoin = <const J extends DetailedJoinSelect>(join: J): J => join;
+export const defineJoin = <const J extends DetailedJoinSelect>(join: J): J =>
+  join;
+
+/** Schema for an explicit, persisted join path step. */
+export const parsedJoinPathSchema = {
+  type: {
+    table: "string",
+    on: {
+      oneOf: [
+        { type: "string" },
+        { arrayOf: { record: { values: "string" } } },
+      ],
+    },
+    params: { record: { values: "unknown" }, optional: true },
+    reversed: { type: "boolean", optional: true },
+  },
+} as const satisfies JSONB.JSONBSchema;
 
 const getJoinFunc = (joinType: "$leftJoin" | "$innerJoin" = "$leftJoin") => {
   const joinMaker: JoinMaker = (

package/lib/util.ts

@@ -46,7 +46,9 @@ export function filter<T extends AnyObject, ArrFilter extends Partial<T>>(
   array: T[],
   arrFilter: ArrFilter,
 ): T[] {
-  return array.filter((d) => Object.entries(arrFilter).every(([k, v]) => d[k] === v));
+  return array.filter((d) =>
+    Object.entries(arrFilter).every(([k, v]) => d[k] === v),
+  );
 }
 export function find<T extends AnyObject, ArrFilter extends Partial<T>>(
   array: T[],
@@ -125,9 +127,13 @@ export type TextPatch = {
   md5: string;
 };
 
-export function getTextPatch(oldStr: string, newStr: string): TextPatch | string {
+export function getTextPatch(
+  oldStr: string,
+  newStr: string,
+): TextPatch | string {
   /* Big change, no point getting diff */
-  if (!oldStr || !newStr || !oldStr.trim().length || !newStr.trim().length) return newStr;
+  if (!oldStr || !newStr || !oldStr.trim().length || !newStr.trim().length)
+    return newStr;
 
   /* Return no change if matching */
   if (oldStr === newStr)
@@ -172,7 +178,10 @@ export function unpatchText(original: string | null, patch: TextPatch): string {
   let res = original.slice(0, from) + text + original.slice(to);
   if (md5Hash && md5(res) !== md5Hash)
     throw (
-      "Patch text error: Could not match md5 hash: (original/result) \n" + original + "\n" + res
+      "Patch text error: Could not match md5 hash: (original/result) \n" +
+      original +
+      "\n" +
+      res
     );
   return res;
 }
@@ -211,11 +220,15 @@ export const getObjectEntries = <T extends Record<string, any>>(
 export function isObject(obj: any | undefined): obj is Record<string, any> {
   return Boolean(obj && typeof obj === "object" && !Array.isArray(obj));
 }
-export function isDefined<T>(v: T | undefined | void | null): v is NonNullable<T> {
+export function isDefined<T>(
+  v: T | undefined | void | null,
+): v is NonNullable<T> {
   return v !== undefined && v !== null;
 }
 
-export function getKeys<T extends Record<string, any>>(o: T): (keyof T & string)[] {
+export function getKeys<T extends Record<string, any>>(
+  o: T,
+): (keyof T & string)[] {
   return Object.keys(o) as unknown as (keyof T & string)[];
 }
 
@@ -226,15 +239,18 @@ export type Explode<T> =
     : never
   : never;
 export type AtMostOne<T> = Explode<Partial<T>>;
-export type AtLeastOne<T, U = { [K in keyof T]: Pick<T, K> }> = Partial<T> & U[keyof U];
+export type AtLeastOne<T, U = { [K in keyof T]: Pick<T, K> }> = Partial<T> &
+  U[keyof U];
 export type ExactlyOne<T> = AtMostOne<T> & AtLeastOne<T>;
 
 type UnionKeys<T> = T extends T ? keyof T : never;
 type StrictUnionHelper<T, TAll> =
-  T extends any ? T & Partial<Record<Exclude<UnionKeys<TAll>, keyof T>, never>> : never;
+  T extends any ? T & Partial<Record<Exclude<UnionKeys<TAll>, keyof T>, never>>
+  : never;
 export type StrictUnion<T> = StrictUnionHelper<T, T>;
 
-export type PartialByKeys<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+export type PartialByKeys<T, K extends keyof T> = Omit<T, K> &
+  Partial<Pick<T, K>>;
 export type Simplify<T> = { [K in keyof T]: T[K] } & {};
 
 /**
@@ -245,7 +261,11 @@ export const tryCatch = async <T extends AnyObject>(
   func: () => T | Promise<T>,
 ): Promise<
   | (T & { hasError?: false; error?: undefined; duration: number })
-  | (Partial<Record<keyof T, undefined>> & { hasError: true; error: unknown; duration: number })
+  | (Partial<Record<keyof T, undefined>> & {
+      hasError: true;
+      error: unknown;
+      duration: number;
+    })
 > => {
   const startTime = Date.now();
   try {
@@ -263,31 +283,36 @@ export const tryCatch = async <T extends AnyObject>(
   }
 };
 
-export type ParsedJoinPath = Required<JoinPath>;
-export const reverseJoinOn = (on: ParsedJoinPath["on"]) => {
+export type ParsedJoinPath = JoinPath & { on: NonNullable<JoinPath["on"]> };
+export const reverseJoinOn = (on: Record<string, string>[]) => {
   return on.map((constraint) =>
-    Object.fromEntries(Object.entries(constraint).map(([left, right]) => [right, left])),
+    Object.fromEntries(
+      Object.entries(constraint).map(([left, right]) => [right, left]),
+    ),
   );
 };
 
-/**
- * result = [
- *  { table, on: parsedPath[0] }
- *  ...parsedPath.map(p => ({ table: p.table, on: reversedOn(parsedPath[i+1].on) }))
- * ]
- */
-export const reverseParsedPath = (parsedPath: ParsedJoinPath[], table: string) => {
-  const newPPath: ParsedJoinPath[] = [{ table, on: [{}] }, ...(parsedPath ?? [])];
-  return newPPath
-    .map((pp, i) => {
-      const nextPath = newPPath[i + 1];
-      if (!nextPath) return undefined;
+/** Reverse each join toward its source table, then reverse the path order. */
+export const reverseParsedPath = (
+  parsedPath: ParsedJoinPath[],
+  table: string,
+) => {
+  return (parsedPath ?? [])
+    .map(({ table: targetTable, on, params, reversed }, index) => {
+      const sourceTable = parsedPath[index - 1]?.table ?? table;
+      if (typeof on === "string") {
+        return {
+          table: sourceTable,
+          on,
+          ...(params && { params }),
+          ...(targetTable === sourceTable && { reversed: !reversed }),
+        };
+      }
       return {
-        table: pp.table,
-        on: reverseJoinOn(nextPath.on),
+        table: sourceTable,
+        on: reverseJoinOn(on),
       };
     })
-    .filter(isDefined)
     .reverse();
 };
 
@@ -368,7 +393,8 @@ export const getProperty = <T extends object, K extends string>(
 ): K extends keyof T ? T[K]
 : K extends string ? T[keyof T] | undefined
 : undefined => {
-  if (!Object.keys(obj).includes(key)) return undefined as K extends keyof T ? T[K] : undefined;
+  if (!Object.keys(obj).includes(key))
+    return undefined as K extends keyof T ? T[K] : undefined;
   return obj[key as keyof T] as K extends keyof T ? T[K] : undefined;
 };
 
@@ -380,7 +406,10 @@ export const withTimeout = <T>(promise: Promise<T>, ms: number): Promise<T> => {
 };
 
 export const createPromiseWithTimeout = <T>(
-  executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void,
+  executor: (
+    resolve: (value: T | PromiseLike<T>) => void,
+    reject: (reason?: any) => void,
+  ) => void,
   ms: number,
 ): Promise<T> => {
   const timeout = new Promise<never>((_, reject) =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-types",
-  "version": "4.0.301",
+  "version": "4.0.303",
   "description": "",
   "main": "dist/index_umd.js",
   "types": "dist/index.d.ts",