From a183f21078c9ce2037c21ffd64bb697c2be6f19b Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 17 Feb 2024 19:15:50 +0200
Subject: [PATCH] server-ts: Convert attribute_formatter

---
 src/routes/api/clipper.js                                 | 2 +-
 src/routes/api/search.js                                  | 2 +-
 .../{attribute_formatter.js => attribute_formatter.ts}    | 8 +++++---
 src/services/attributes.js                                | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename src/services/{attribute_formatter.js => attribute_formatter.ts} (83%)

diff --git a/src/routes/api/clipper.js b/src/routes/api/clipper.js
index ea4fb64c3..249051887 100644
--- a/src/routes/api/clipper.js
+++ b/src/routes/api/clipper.js
@@ -12,7 +12,7 @@ const log = require('../../services/log');
 const utils = require('../../services/utils');
 const path = require('path');
 const htmlSanitizer = require('../../services/html_sanitizer.js');
-const {formatAttrForSearch} = require('../../services/attribute_formatter.js');
+const {formatAttrForSearch} = require('../../services/attribute_formatter');
 const jsdom = require("jsdom");
 const { JSDOM } = jsdom;
 
diff --git a/src/routes/api/search.js b/src/routes/api/search.js
index b98e08517..a582dafcd 100644
--- a/src/routes/api/search.js
+++ b/src/routes/api/search.js
@@ -5,7 +5,7 @@ const SearchContext = require('../../services/search/search_context.js');
 const searchService = require('../../services/search/services/search.js');
 const bulkActionService = require('../../services/bulk_actions.js');
 const cls = require('../../services/cls');
-const {formatAttrForSearch} = require('../../services/attribute_formatter.js');
+const {formatAttrForSearch} = require('../../services/attribute_formatter');
 const ValidationError = require('../../errors/validation_error');
 
 function searchFromNote(req) {
diff --git a/src/services/attribute_formatter.js b/src/services/attribute_formatter.ts
similarity index 83%
rename from src/services/attribute_formatter.js
rename to src/services/attribute_formatter.ts
index c8a9c1de6..846450f36 100644
--- a/src/services/attribute_formatter.js
+++ b/src/services/attribute_formatter.ts
@@ -1,6 +1,8 @@
 "use strict";
 
-function formatAttrForSearch(attr, searchWithValue) {
+import BAttribute = require("../becca/entities/battribute");
+
+function formatAttrForSearch(attr: BAttribute, searchWithValue: string) {
     let searchStr = '';
 
     if (attr.type === 'label') {
@@ -27,7 +29,7 @@ function formatAttrForSearch(attr, searchWithValue) {
     return searchStr;
 }
 
-function formatValue(val) {
+function formatValue(val: string) {
     if (!/[^\w]/.test(val)) {
         return val;
     }
@@ -45,6 +47,6 @@ function formatValue(val) {
     }
 }
 
-module.exports = {
+export = {
     formatAttrForSearch
 };
diff --git a/src/services/attributes.js b/src/services/attributes.js
index 69e12faa1..fc527429c 100644
--- a/src/services/attributes.js
+++ b/src/services/attributes.js
@@ -4,7 +4,7 @@ const searchService = require('./search/services/search.js');
 const sql = require('./sql');
 const becca = require('../becca/becca');
 const BAttribute = require('../becca/entities/battribute');
-const {formatAttrForSearch} = require('./attribute_formatter.js');
+const {formatAttrForSearch} = require('./attribute_formatter');
 const BUILTIN_ATTRIBUTES = require('./builtin_attributes');
 
 const ATTRIBUTE_TYPES = ['label', 'relation'];