@porulle/adapter-pg-search 0.10.8 → 0.13.0

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EAKnB,MAAM,eAAe,CAAC;AAEvB,MAAM,WAAW,sBAAsB;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;QAAE,IAAI,EAAE,sBAAsB,EAAE,CAAA;KAAE,CAAC,CAAC;IACvF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAqND,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,aAAa,CAwK9E"}

package/dist/{src/index.js → index.js}

@@ -39,9 +39,46 @@ function parseBrands(value) {
     }
     return [];
 }
+function parseAttributes(value) {
+    let parsed = value;
+    if (typeof value === "string") {
+        try {
+            parsed = JSON.parse(value);
+        }
+        catch {
+            return {};
+        }
+    }
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
+        return {};
+    const attributes = {};
+    for (const [key, entry] of Object.entries(parsed)) {
+        if (typeof entry === "string") {
+            attributes[key] = entry;
+        }
+        else if (Array.isArray(entry) && entry.every((item) => typeof item === "string")) {
+            attributes[key] = entry;
+        }
+    }
+    return attributes;
+}
+function attributeValues(document, name) {
+    const value = document.attributes?.[name];
+    if (value == null)
+        return [];
+    return Array.isArray(value) ? value : [value];
+}
 function toDocument(row) {
+    const attributes = parseAttributes(row.attributes);
+    const payload = row.payload && typeof row.payload === "object"
+        ? row.payload
+        : {};
+    const organizationId = typeof payload.organizationId === "string"
+        ? payload.organizationId
+        : undefined;
     return {
         id: String(row.id ?? ""),
+        ...(organizationId ? { organizationId } : {}),
         type: String(row.type ?? ""),
         slug: String(row.slug ?? ""),
         title: String(row.title ?? ""),
@@ -50,7 +87,8 @@ function toDocument(row) {
         categories: parseCategories(row.categories),
         brands: parseBrands(row.brands),
         text: String(row.text ?? ""),
-        ...(row.payload && typeof row.payload === "object" ? { payload: row.payload } : {}),
+        ...(Object.keys(attributes).length > 0 ? { attributes } : {}),
+        ...(Object.keys(payload).length > 0 ? { payload } : {}),
     };
 }
 function buildWhere(params, dictionary) {
@@ -64,6 +102,10 @@ function buildWhere(params, dictionary) {
         values.push(params.filters.type);
         clauses.push(`type = $${values.length}`);
     }
+    if (params.filters?.organizationId) {
+        values.push(params.filters.organizationId);
+        clauses.push(`payload ->> 'organizationId' = $${values.length}`);
+    }
     if (params.filters?.status) {
         values.push(params.filters.status);
         clauses.push(`status = $${values.length}`);
@@ -76,6 +118,20 @@ function buildWhere(params, dictionary) {
         values.push(params.filters.brand);
         clauses.push(`$${values.length} = ANY(brands)`);
     }
+    for (const [name, requested] of Object.entries(params.filters?.attributes ?? {})) {
+        values.push(name);
+        const keyPlaceholder = `$${values.length}`;
+        const requestedValues = Array.isArray(requested) ? requested : [requested];
+        if (requestedValues.length === 0) {
+            clauses.push("FALSE");
+            continue;
+        }
+        const valuePlaceholders = requestedValues.map((value) => {
+            values.push(value);
+            return `$${values.length}`;
+        });
+        clauses.push(`EXISTS (SELECT 1 FROM jsonb_array_elements_text(CASE WHEN jsonb_typeof(attributes -> ${keyPlaceholder}) = 'array' THEN attributes -> ${keyPlaceholder} ELSE jsonb_build_array(attributes ->> ${keyPlaceholder}) END) AS attribute_value WHERE attribute_value IN (${valuePlaceholders.join(", ")}))`);
+    }
     return {
         sql: clauses.length > 0 ? `WHERE ${clauses.join(" AND ")}` : "",
         values,
@@ -113,6 +169,21 @@ function computeFacets(documents, requested) {
             }
         }
     }
+    for (const facet of facets) {
+        const attributeName = facet.startsWith("attributes.")
+            ? facet.slice("attributes.".length)
+            : facet;
+        if (["type", "status", "category", "categories", "brand", "brands"].includes(attributeName))
+            continue;
+        const values = {};
+        for (const document of documents) {
+            for (const value of new Set(attributeValues(document, attributeName))) {
+                values[value] = (values[value] ?? 0) + 1;
+            }
+        }
+        if (Object.keys(values).length > 0)
+            output[attributeName] = values;
+    }
     return output;
 }
 export function pgSearchAdapter(options) {
@@ -125,8 +196,8 @@ export function pgSearchAdapter(options) {
                 if (documents.length === 0)
                     return Ok(undefined);
                 for (const document of documents) {
-                    await options.query(`INSERT INTO ${table} (id, type, slug, title, description, status, categories, brands, text, payload)
-             VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10::jsonb)
+                    await options.query(`INSERT INTO ${table} (id, type, slug, title, description, status, categories, brands, text, attributes, payload)
+             VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10::jsonb, $11::jsonb)
              ON CONFLICT (id)
              DO UPDATE SET
                type = EXCLUDED.type,
@@ -137,6 +208,7 @@ export function pgSearchAdapter(options) {
                categories = EXCLUDED.categories,
                brands = EXCLUDED.brands,
                text = EXCLUDED.text,
+               attributes = EXCLUDED.attributes,
                payload = EXCLUDED.payload`, [
                         document.id,
                         document.type,
@@ -147,7 +219,11 @@ export function pgSearchAdapter(options) {
                         document.categories,
                         document.brands,
                         document.text,
-                        JSON.stringify(document.payload ?? {}),
+                        JSON.stringify(document.attributes ?? {}),
+                        JSON.stringify({
+                            ...(document.payload ?? {}),
+                            ...(document.organizationId ? { organizationId: document.organizationId } : {}),
+                        }),
                     ]);
                 }
                 return Ok(undefined);
@@ -182,14 +258,14 @@ export function pgSearchAdapter(options) {
                 const scoreExpr = params.query.trim().length > 0
                     ? `ts_rank(to_tsvector('${dictionary}', text), plainto_tsquery('${dictionary}', $1))`
                     : "0";
-                const rows = await options.query(`SELECT id, type, slug, title, description, status, categories, brands, text, payload, ${scoreExpr} AS score
+                const rows = await options.query(`SELECT id, type, slug, title, description, status, categories, brands, text, attributes, payload, ${scoreExpr} AS score
            FROM ${table}
            ${where.sql}
            ORDER BY score DESC, title ASC
            LIMIT $${where.values.length + 1}
            OFFSET $${where.values.length + 2}`, [...where.values, limit, offset]);
                 const countRows = await options.query(`SELECT COUNT(*)::int AS total FROM ${table} ${where.sql}`, where.values);
-                const facetRows = await options.query(`SELECT id, type, slug, title, description, status, categories, brands, text, payload
+                const facetRows = await options.query(`SELECT id, type, slug, title, description, status, categories, brands, text, attributes, payload
            FROM ${table}
            ${where.sql}`, where.values);
                 const documents = facetRows.rows.map((row) => toDocument(row));
@@ -225,6 +301,10 @@ export function pgSearchAdapter(options) {
                     values.push(params.type);
                     conditions.push(`type = $${values.length}`);
                 }
+                if (params.organizationId) {
+                    values.push(params.organizationId);
+                    conditions.push(`payload ->> 'organizationId' = $${values.length}`);
+                }
                 values.push(limit);
                 const rows = await options.query(`SELECT DISTINCT title
            FROM ${table}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@porulle/adapter-pg-search",
-  "version": "0.10.8",
+  "version": "0.13.0",
   "license": "MIT",
   "type": "module",
   "exports": {
@@ -11,15 +11,15 @@
     }
   },
   "dependencies": {
-    "@porulle/core": "0.10.8"
+    "@porulle/core": "0.13.0"
   },
   "devDependencies": {
     "@types/node": "^24.5.2",
     "eslint": "^9.39.1",
     "typescript": "5.9.2",
     "vitest": "^3.2.4",
-    "@porulle/eslint-config": "0.1.0",
-    "@porulle/typescript-config": "0.1.0"
+    "@porulle/typescript-config": "0.1.0",
+    "@porulle/eslint-config": "0.1.0"
   },
   "publishConfig": {
     "access": "public"

package/src/index.ts

@@ -64,9 +64,45 @@ function parseBrands(value: unknown): string[] {
   return [];
 }
 
+function parseAttributes(value: unknown): Record<string, string | string[]> {
+  let parsed: unknown = value;
+  if (typeof value === "string") {
+    try {
+      parsed = JSON.parse(value) as unknown;
+    } catch {
+      return {};
+    }
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
+
+  const attributes: Record<string, string | string[]> = {};
+  for (const [key, entry] of Object.entries(parsed)) {
+    if (typeof entry === "string") {
+      attributes[key] = entry;
+    } else if (Array.isArray(entry) && entry.every((item) => typeof item === "string")) {
+      attributes[key] = entry as string[];
+    }
+  }
+  return attributes;
+}
+
+function attributeValues(document: SearchDocument, name: string): string[] {
+  const value = document.attributes?.[name];
+  if (value == null) return [];
+  return Array.isArray(value) ? value : [value];
+}
+
 function toDocument(row: PgSearchQueryResultRow): SearchDocument {
+  const attributes = parseAttributes(row.attributes);
+  const payload = row.payload && typeof row.payload === "object"
+    ? row.payload as Record<string, unknown>
+    : {};
+  const organizationId = typeof payload.organizationId === "string"
+    ? payload.organizationId
+    : undefined;
   return {
     id: String(row.id ?? ""),
+    ...(organizationId ? { organizationId } : {}),
     type: String(row.type ?? ""),
     slug: String(row.slug ?? ""),
     title: String(row.title ?? ""),
@@ -75,7 +111,8 @@ function toDocument(row: PgSearchQueryResultRow): SearchDocument {
     categories: parseCategories(row.categories),
     brands: parseBrands(row.brands),
     text: String(row.text ?? ""),
-    ...(row.payload && typeof row.payload === "object" ? { payload: row.payload as Record<string, unknown> } : {}),
+    ...(Object.keys(attributes).length > 0 ? { attributes } : {}),
+    ...(Object.keys(payload).length > 0 ? { payload } : {}),
   };
 }
 
@@ -96,6 +133,11 @@ function buildWhere(
     clauses.push(`type = $${values.length}`);
   }
 
+  if (params.filters?.organizationId) {
+    values.push(params.filters.organizationId);
+    clauses.push(`payload ->> 'organizationId' = $${values.length}`);
+  }
+
   if (params.filters?.status) {
     values.push(params.filters.status);
     clauses.push(`status = $${values.length}`);
@@ -111,6 +153,23 @@ function buildWhere(
     clauses.push(`$${values.length} = ANY(brands)`);
   }
 
+  for (const [name, requested] of Object.entries(params.filters?.attributes ?? {})) {
+    values.push(name);
+    const keyPlaceholder = `$${values.length}`;
+    const requestedValues = Array.isArray(requested) ? requested : [requested];
+    if (requestedValues.length === 0) {
+      clauses.push("FALSE");
+      continue;
+    }
+    const valuePlaceholders = requestedValues.map((value) => {
+      values.push(value);
+      return `$${values.length}`;
+    });
+    clauses.push(
+      `EXISTS (SELECT 1 FROM jsonb_array_elements_text(CASE WHEN jsonb_typeof(attributes -> ${keyPlaceholder}) = 'array' THEN attributes -> ${keyPlaceholder} ELSE jsonb_build_array(attributes ->> ${keyPlaceholder}) END) AS attribute_value WHERE attribute_value IN (${valuePlaceholders.join(", ")}))`,
+    );
+  }
+
   return {
     sql: clauses.length > 0 ? `WHERE ${clauses.join(" AND ")}` : "",
     values,
@@ -154,6 +213,20 @@ function computeFacets(documents: SearchDocument[], requested?: string[]): Recor
     }
   }
 
+  for (const facet of facets) {
+    const attributeName = facet.startsWith("attributes.")
+      ? facet.slice("attributes.".length)
+      : facet;
+    if (["type", "status", "category", "categories", "brand", "brands"].includes(attributeName)) continue;
+    const values: Record<string, number> = {};
+    for (const document of documents) {
+      for (const value of new Set(attributeValues(document, attributeName))) {
+        values[value] = (values[value] ?? 0) + 1;
+      }
+    }
+    if (Object.keys(values).length > 0) output[attributeName] = values;
+  }
+
   return output;
 }
 
@@ -170,8 +243,8 @@ export function pgSearchAdapter(options: PgSearchAdapterOptions): SearchAdapter
 
         for (const document of documents) {
           await options.query(
-            `INSERT INTO ${table} (id, type, slug, title, description, status, categories, brands, text, payload)
-             VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10::jsonb)
+            `INSERT INTO ${table} (id, type, slug, title, description, status, categories, brands, text, attributes, payload)
+             VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10::jsonb, $11::jsonb)
              ON CONFLICT (id)
              DO UPDATE SET
                type = EXCLUDED.type,
@@ -182,6 +255,7 @@ export function pgSearchAdapter(options: PgSearchAdapterOptions): SearchAdapter
                categories = EXCLUDED.categories,
                brands = EXCLUDED.brands,
                text = EXCLUDED.text,
+               attributes = EXCLUDED.attributes,
                payload = EXCLUDED.payload`,
             [
               document.id,
@@ -193,7 +267,11 @@ export function pgSearchAdapter(options: PgSearchAdapterOptions): SearchAdapter
               document.categories,
               document.brands,
               document.text,
-              JSON.stringify(document.payload ?? {}),
+              JSON.stringify(document.attributes ?? {}),
+              JSON.stringify({
+                ...(document.payload ?? {}),
+                ...(document.organizationId ? { organizationId: document.organizationId } : {}),
+              }),
             ],
           );
         }
@@ -232,7 +310,7 @@ export function pgSearchAdapter(options: PgSearchAdapterOptions): SearchAdapter
           : "0";
 
         const rows = await options.query(
-          `SELECT id, type, slug, title, description, status, categories, brands, text, payload, ${scoreExpr} AS score
+          `SELECT id, type, slug, title, description, status, categories, brands, text, attributes, payload, ${scoreExpr} AS score
            FROM ${table}
            ${where.sql}
            ORDER BY score DESC, title ASC
@@ -247,7 +325,7 @@ export function pgSearchAdapter(options: PgSearchAdapterOptions): SearchAdapter
         );
 
         const facetRows = await options.query(
-          `SELECT id, type, slug, title, description, status, categories, brands, text, payload
+          `SELECT id, type, slug, title, description, status, categories, brands, text, attributes, payload
            FROM ${table}
            ${where.sql}`,
           where.values,
@@ -290,6 +368,11 @@ export function pgSearchAdapter(options: PgSearchAdapterOptions): SearchAdapter
           conditions.push(`type = $${values.length}`);
         }
 
+        if (params.organizationId) {
+          values.push(params.organizationId);
+          conditions.push(`payload ->> 'organizationId' = $${values.length}`);
+        }
+
         values.push(limit);
 
         const rows = await options.query(

package/dist/src/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EAKnB,MAAM,eAAe,CAAC;AAEvB,MAAM,WAAW,sBAAsB;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;QAAE,IAAI,EAAE,sBAAsB,EAAE,CAAA;KAAE,CAAC,CAAC;IACvF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA4ID,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,aAAa,CA8J9E"}