@okf/ootils 1.3.1 → 1.3.3

package/dist/index.d.mts

@@ -1,4 +1,5 @@
 import { Connection, Document, Schema, Model } from 'mongoose';
+import IORedis from 'ioredis';
 
 declare function add(a: number, b: number): number;
 
@@ -108,28 +109,6 @@ declare const getTplModelByTenant: ({ tenant, env, mongodb, dbConfigs }: GetMode
     __v: number;
 }, any>;
 
-declare const deleteVal: (data: any, valuePath: string) => any;
-
-type ValuePath = string | string[];
-type DataValue = any;
-interface GetValOptions {
-    flattenIfValueIsArray?: boolean;
-}
-
-declare const setVal: (data: any, valuePath: string, value: DataValue) => any;
-
-/**
- *
- * @param {*} data
- * @param {*} valuePath
- * @returns
- * - if target value is an array found inside an array, it will flatten them out so that there is a single array
- * - if target value is an array NOT found inside an array, that will be returned as is.
- * - if target value is a string/object/number/boolean found inside an array of arrays, then the inner arrays will be flattened so that there is a single array
- * - if target value is a string/object/number/boolean NOT found inside an array, it will be returned as is.
- */
-declare const getVal: (data: any, valuePath: ValuePath, options?: GetValOptions, depthIdx?: number) => any;
-
 interface GetTplParams {
     name: string;
     tenant: string;
@@ -163,5 +142,39 @@ declare const getTpl: ({ name, tenant }: GetTplParams) => Promise<Template>;
 declare const getAIConfigs: ({ tenant }: GetAIConfigsParams) => Promise<AIconfig>;
 
 declare const connectToRedis: () => Promise<void>;
+declare const getRedisClient: () => IORedis;
+
+declare const deleteVal: (data: any, valuePath: string) => any;
+
+type ValuePath = string | string[];
+type DataValue = any;
+interface GetValOptions {
+    flattenIfValueIsArray?: boolean;
+}
+
+declare const setVal: (data: any, valuePath: string, value: DataValue) => any;
+
+/**
+ *
+ * @param {*} data
+ * @param {*} valuePath
+ * @returns
+ * - if target value is an array found inside an array, it will flatten them out so that there is a single array
+ * - if target value is an array NOT found inside an array, that will be returned as is.
+ * - if target value is a string/object/number/boolean found inside an array of arrays, then the inner arrays will be flattened so that there is a single array
+ * - if target value is a string/object/number/boolean NOT found inside an array, it will be returned as is.
+ */
+declare const getVal: (data: any, valuePath: ValuePath, options?: GetValOptions, depthIdx?: number) => any;
+
+interface RichTextBlock {
+    text: string;
+    [key: string]: any;
+}
+interface RichTextValue {
+    blocks: RichTextBlock[];
+    [key: string]: any;
+}
+type TagNameInput = string | number | RichTextValue | null | undefined;
+declare const genTagId: (tagName: TagNameInput) => string;
 
-export { add, connectToRedis, deleteVal, getAIConfigs, getAnnotationsModelByTenant, getDbByTenant, getModelByTenant, getPlatformConfigsModelByTenant, getTpl, getTplModelByTenant, getVal, initializeGlobalConfig, multiConnectToMongoDB, setVal, updateGlobalConfig };
+export { add, connectToRedis, deleteVal, genTagId, getAIConfigs, getAnnotationsModelByTenant, getDbByTenant, getModelByTenant, getPlatformConfigsModelByTenant, getRedisClient, getTpl, getTplModelByTenant, getVal, initializeGlobalConfig, multiConnectToMongoDB, setVal, updateGlobalConfig };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { Connection, Document, Schema, Model } from 'mongoose';
+import IORedis from 'ioredis';
 
 declare function add(a: number, b: number): number;
 
@@ -108,28 +109,6 @@ declare const getTplModelByTenant: ({ tenant, env, mongodb, dbConfigs }: GetMode
     __v: number;
 }, any>;
 
-declare const deleteVal: (data: any, valuePath: string) => any;
-
-type ValuePath = string | string[];
-type DataValue = any;
-interface GetValOptions {
-    flattenIfValueIsArray?: boolean;
-}
-
-declare const setVal: (data: any, valuePath: string, value: DataValue) => any;
-
-/**
- *
- * @param {*} data
- * @param {*} valuePath
- * @returns
- * - if target value is an array found inside an array, it will flatten them out so that there is a single array
- * - if target value is an array NOT found inside an array, that will be returned as is.
- * - if target value is a string/object/number/boolean found inside an array of arrays, then the inner arrays will be flattened so that there is a single array
- * - if target value is a string/object/number/boolean NOT found inside an array, it will be returned as is.
- */
-declare const getVal: (data: any, valuePath: ValuePath, options?: GetValOptions, depthIdx?: number) => any;
-
 interface GetTplParams {
     name: string;
     tenant: string;
@@ -163,5 +142,39 @@ declare const getTpl: ({ name, tenant }: GetTplParams) => Promise<Template>;
 declare const getAIConfigs: ({ tenant }: GetAIConfigsParams) => Promise<AIconfig>;
 
 declare const connectToRedis: () => Promise<void>;
+declare const getRedisClient: () => IORedis;
+
+declare const deleteVal: (data: any, valuePath: string) => any;
+
+type ValuePath = string | string[];
+type DataValue = any;
+interface GetValOptions {
+    flattenIfValueIsArray?: boolean;
+}
+
+declare const setVal: (data: any, valuePath: string, value: DataValue) => any;
+
+/**
+ *
+ * @param {*} data
+ * @param {*} valuePath
+ * @returns
+ * - if target value is an array found inside an array, it will flatten them out so that there is a single array
+ * - if target value is an array NOT found inside an array, that will be returned as is.
+ * - if target value is a string/object/number/boolean found inside an array of arrays, then the inner arrays will be flattened so that there is a single array
+ * - if target value is a string/object/number/boolean NOT found inside an array, it will be returned as is.
+ */
+declare const getVal: (data: any, valuePath: ValuePath, options?: GetValOptions, depthIdx?: number) => any;
+
+interface RichTextBlock {
+    text: string;
+    [key: string]: any;
+}
+interface RichTextValue {
+    blocks: RichTextBlock[];
+    [key: string]: any;
+}
+type TagNameInput = string | number | RichTextValue | null | undefined;
+declare const genTagId: (tagName: TagNameInput) => string;
 
-export { add, connectToRedis, deleteVal, getAIConfigs, getAnnotationsModelByTenant, getDbByTenant, getModelByTenant, getPlatformConfigsModelByTenant, getTpl, getTplModelByTenant, getVal, initializeGlobalConfig, multiConnectToMongoDB, setVal, updateGlobalConfig };
+export { add, connectToRedis, deleteVal, genTagId, getAIConfigs, getAnnotationsModelByTenant, getDbByTenant, getModelByTenant, getPlatformConfigsModelByTenant, getRedisClient, getTpl, getTplModelByTenant, getVal, initializeGlobalConfig, multiConnectToMongoDB, setVal, updateGlobalConfig };

package/dist/index.js

@@ -49,8 +49,9 @@ var require_Annotations = __commonJS({
                 tagId: String
               }
             ],
-            collectionId: String
-          }, { _id: false })
+            collectionId: String,
+            _id: false
+          })
         },
         // Meta information
         meta: {
@@ -73,6 +74,7 @@ var require_Annotations = __commonJS({
         annotations: {
           tags: {
             type: Map,
+            _id: false,
             of: new Schema({
               collectionId: String,
               data: [
@@ -82,7 +84,7 @@ var require_Annotations = __commonJS({
                   tagId: String
                 }
               ]
-            }, { _id: false })
+            })
           },
           fragment: {
             isLexical: Boolean,
@@ -318,11 +320,13 @@ __export(index_exports, {
   add: () => add,
   connectToRedis: () => connectToRedis,
   deleteVal: () => deleteVal,
+  genTagId: () => genTagId,
   getAIConfigs: () => getAIConfigs,
   getAnnotationsModelByTenant: () => getAnnotationsModelByTenant,
   getDbByTenant: () => getDbByTenant,
   getModelByTenant: () => getModelByTenant,
   getPlatformConfigsModelByTenant: () => getPlatformConfigsModelByTenant,
+  getRedisClient: () => getRedisClient,
   getTpl: () => getTpl,
   getTplModelByTenant: () => getTplModelByTenant,
   getVal: () => getVal,
@@ -373,7 +377,7 @@ var updateGlobalConfig = (updates) => {
 var mongoOptions = {
   // Note: These legacy options are no longer needed in newer versions of mongoose
   // useUnifiedTopology, useNewUrlParser, useCreateIndex, useFindAndModify are deprecated
-  maxPoolSize: 10
+  maxPoolSize: 20
   // replaces poolSize
 };
 var multiConnectToMongoDB = ({ env, dbConfigs } = {}) => {
@@ -474,6 +478,113 @@ var getTplModelByTenant = ({ tenant, env, mongodb, dbConfigs }) => getModelByTen
   env
 });
 
+// src/redis/index.ts
+var import_ioredis = __toESM(require("ioredis"));
+var redisClient = null;
+var REDIS_CONFIG = {
+  port: Number(process.env.REDIS_PORT),
+  host: process.env.REDIS_HOST || "",
+  username: process.env.REDIS_USERNAME || "",
+  password: process.env.REDIS_PASSWORD || ""
+};
+var connectToRedis = async () => {
+  try {
+    redisClient = new import_ioredis.default(REDIS_CONFIG);
+    await redisClient.ping();
+    console.log("Redis connected successfully");
+  } catch (error) {
+    console.error(
+      "Redis connection failed:",
+      error instanceof Error && error.message
+    );
+    if (redisClient) {
+      redisClient.disconnect();
+    }
+    throw error;
+  }
+};
+var getRedisClient = () => {
+  if (!redisClient) {
+    throw new Error("Redis client not initialized. Call connectToRedis first.");
+  }
+  return redisClient;
+};
+
+// src/redis/functions.ts
+var findInCache = async ({
+  tenant,
+  modelName,
+  type,
+  query = {}
+}) => {
+  const key = `${process.env.ENV}:${tenant}:${modelName}:${type}`;
+  try {
+    const redisClient2 = getRedisClient();
+    const value = await redisClient2.get(key);
+    if (value) {
+      return JSON.parse(value);
+    }
+  } catch (error) {
+    console.warn(
+      `redis read failed for key ${key}`,
+      error instanceof Error && error.message
+    );
+  }
+  try {
+    const collection = getDbByTenant({
+      tenant,
+      env: process.env.ENV
+    }).collection(modelName);
+    const value = await collection.findOne(query);
+    if (!value) {
+      throw new Error(`${type} value not found in ${modelName} for ${tenant}`);
+    }
+    try {
+      const redisClient2 = getRedisClient();
+      await redisClient2.set(key, JSON.stringify(value));
+    } catch (error) {
+      console.warn(
+        `redis write failed for key ${key}:`,
+        error instanceof Error && error.message
+      );
+    }
+    return value;
+  } catch (error) {
+    throw new Error(
+      `db read failed:  ${error instanceof Error && error.message}`
+    );
+  }
+};
+var getTpl = async ({ name, tenant }) => {
+  if (!name || !tenant) {
+    throw new Error("Missing required parameters: name or tenant");
+  }
+  return await findInCache({
+    modelName: "tpls",
+    type: name,
+    tenant,
+    query: {
+      kp_content_type: name,
+      status: { $in: ["published", "editPublished"] }
+    }
+  });
+};
+var getAIConfigs = async ({
+  tenant
+}) => {
+  if (!tenant) {
+    throw new Error("Missing required parameter: tenant");
+  }
+  return await findInCache({
+    modelName: "platformConfigs",
+    type: "ai",
+    tenant,
+    query: {
+      type: "ai"
+    }
+  });
+};
+
 // src/utils/getterSetterDeleter/utils/set_deleteVal.ts
 var set_deleteVal = (action, data, valuePath, value) => {
   if (valuePath === void 0) return;
@@ -605,122 +716,42 @@ var getValV2_getter = (data, valuePath, options, depthIdx) => {
   return dataRef[keysArray[len - 1]];
 };
 
-// src/redis/index.ts
-var import_ioredis = __toESM(require("ioredis"));
-var redisClient = null;
-var REDIS_CONFIG = {
-  port: Number(process.env.REDIS_PORT),
-  host: process.env.REDIS_HOST || "",
-  username: process.env.REDIS_USERNAME || "",
-  password: process.env.REDIS_PASSWORD || ""
-};
-var connectToRedis = async () => {
-  try {
-    redisClient = new import_ioredis.default(REDIS_CONFIG);
-    await redisClient.ping();
-    console.log("Redis connected successfully");
-  } catch (error) {
-    console.error(
-      "Redis connection failed:",
-      error instanceof Error && error.message
-    );
-    if (redisClient) {
-      redisClient.disconnect();
-    }
-    throw error;
-  }
-};
-var getRedisClient = () => {
-  if (!redisClient) {
-    throw new Error("Redis client not initialized. Call connectToRedis first.");
-  }
-  return redisClient;
-};
-
-// src/redis/functions.ts
-var findInCache = async ({
-  tenant,
-  modelName,
-  type,
-  query = {}
-}) => {
-  const key = `${process.env.ENV}:${tenant}:${modelName}:${type}`;
-  try {
-    const redisClient2 = getRedisClient();
-    const value = await redisClient2.get(key);
-    if (value) {
-      return JSON.parse(value);
-    }
-  } catch (error) {
-    console.warn(
-      `redis read failed for key ${key}`,
-      error instanceof Error && error.message
-    );
+// src/utils/genTagId.ts
+var convertFromRichText = (value) => {
+  if (!value) return "";
+  let val = "";
+  if (typeof value === "string" || typeof value === "number") {
+    return String(value);
   }
-  try {
-    const collection = getDbByTenant({
-      tenant,
-      env: process.env.ENV
-    }).collection(modelName);
-    const value = await collection.findOne(query);
-    if (!value) {
-      throw new Error(`${type} value not found in ${modelName} for ${tenant}`);
-    }
-    try {
-      const redisClient2 = getRedisClient();
-      await redisClient2.set(key, JSON.stringify(value));
-    } catch (error) {
-      console.warn(
-        `redis write failed for key ${key}:`,
-        error instanceof Error && error.message
-      );
+  if (typeof value === "object" && "blocks" in value && Array.isArray(value.blocks)) {
+    for (let i = 0; i < value.blocks.length; i++) {
+      const block = value.blocks[i];
+      if (block && block.text && block.text.length > 0) {
+        val = val + block.text;
+      }
     }
-    return value;
-  } catch (error) {
-    throw new Error(
-      `db read failed:  ${error instanceof Error && error.message}`
-    );
-  }
-};
-var getTpl = async ({ name, tenant }) => {
-  if (!name || !tenant) {
-    throw new Error("Missing required parameters: name or tenant");
   }
-  return await findInCache({
-    modelName: "tpls",
-    type: name,
-    tenant,
-    query: {
-      kp_content_type: name,
-      status: { $in: ["published", "editPublished"] }
-    }
-  });
+  return val;
 };
-var getAIConfigs = async ({
-  tenant
-}) => {
-  if (!tenant) {
-    throw new Error("Missing required parameter: tenant");
-  }
-  return await findInCache({
-    modelName: "platformConfigs",
-    type: "ai",
-    tenant,
-    query: {
-      type: "ai"
-    }
-  });
+var genTagId = (tagName) => {
+  let toReturn = convertFromRichText(tagName);
+  const regex = /[^\p{L}\p{N}\+]+/gui;
+  toReturn = toReturn.trim().toLowerCase().replace(regex, "_");
+  toReturn = toReturn.replace(/\+/g, "plus");
+  return toReturn.replace(/^_+|_+$/, "");
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   add,
   connectToRedis,
   deleteVal,
+  genTagId,
   getAIConfigs,
   getAnnotationsModelByTenant,
   getDbByTenant,
   getModelByTenant,
   getPlatformConfigsModelByTenant,
+  getRedisClient,
   getTpl,
   getTplModelByTenant,
   getVal,

package/dist/index.mjs

@@ -28,8 +28,9 @@ var require_Annotations = __commonJS({
                 tagId: String
               }
             ],
-            collectionId: String
-          }, { _id: false })
+            collectionId: String,
+            _id: false
+          })
         },
         // Meta information
         meta: {
@@ -52,6 +53,7 @@ var require_Annotations = __commonJS({
         annotations: {
           tags: {
             type: Map,
+            _id: false,
             of: new Schema({
               collectionId: String,
               data: [
@@ -61,7 +63,7 @@ var require_Annotations = __commonJS({
                   tagId: String
                 }
               ]
-            }, { _id: false })
+            })
           },
           fragment: {
             isLexical: Boolean,
@@ -331,7 +333,7 @@ var updateGlobalConfig = (updates) => {
 var mongoOptions = {
   // Note: These legacy options are no longer needed in newer versions of mongoose
   // useUnifiedTopology, useNewUrlParser, useCreateIndex, useFindAndModify are deprecated
-  maxPoolSize: 10
+  maxPoolSize: 20
   // replaces poolSize
 };
 var multiConnectToMongoDB = ({ env, dbConfigs } = {}) => {
@@ -432,6 +434,113 @@ var getTplModelByTenant = ({ tenant, env, mongodb, dbConfigs }) => getModelByTen
   env
 });
 
+// src/redis/index.ts
+import IORedis from "ioredis";
+var redisClient = null;
+var REDIS_CONFIG = {
+  port: Number(process.env.REDIS_PORT),
+  host: process.env.REDIS_HOST || "",
+  username: process.env.REDIS_USERNAME || "",
+  password: process.env.REDIS_PASSWORD || ""
+};
+var connectToRedis = async () => {
+  try {
+    redisClient = new IORedis(REDIS_CONFIG);
+    await redisClient.ping();
+    console.log("Redis connected successfully");
+  } catch (error) {
+    console.error(
+      "Redis connection failed:",
+      error instanceof Error && error.message
+    );
+    if (redisClient) {
+      redisClient.disconnect();
+    }
+    throw error;
+  }
+};
+var getRedisClient = () => {
+  if (!redisClient) {
+    throw new Error("Redis client not initialized. Call connectToRedis first.");
+  }
+  return redisClient;
+};
+
+// src/redis/functions.ts
+var findInCache = async ({
+  tenant,
+  modelName,
+  type,
+  query = {}
+}) => {
+  const key = `${process.env.ENV}:${tenant}:${modelName}:${type}`;
+  try {
+    const redisClient2 = getRedisClient();
+    const value = await redisClient2.get(key);
+    if (value) {
+      return JSON.parse(value);
+    }
+  } catch (error) {
+    console.warn(
+      `redis read failed for key ${key}`,
+      error instanceof Error && error.message
+    );
+  }
+  try {
+    const collection = getDbByTenant({
+      tenant,
+      env: process.env.ENV
+    }).collection(modelName);
+    const value = await collection.findOne(query);
+    if (!value) {
+      throw new Error(`${type} value not found in ${modelName} for ${tenant}`);
+    }
+    try {
+      const redisClient2 = getRedisClient();
+      await redisClient2.set(key, JSON.stringify(value));
+    } catch (error) {
+      console.warn(
+        `redis write failed for key ${key}:`,
+        error instanceof Error && error.message
+      );
+    }
+    return value;
+  } catch (error) {
+    throw new Error(
+      `db read failed:  ${error instanceof Error && error.message}`
+    );
+  }
+};
+var getTpl = async ({ name, tenant }) => {
+  if (!name || !tenant) {
+    throw new Error("Missing required parameters: name or tenant");
+  }
+  return await findInCache({
+    modelName: "tpls",
+    type: name,
+    tenant,
+    query: {
+      kp_content_type: name,
+      status: { $in: ["published", "editPublished"] }
+    }
+  });
+};
+var getAIConfigs = async ({
+  tenant
+}) => {
+  if (!tenant) {
+    throw new Error("Missing required parameter: tenant");
+  }
+  return await findInCache({
+    modelName: "platformConfigs",
+    type: "ai",
+    tenant,
+    query: {
+      type: "ai"
+    }
+  });
+};
+
 // src/utils/getterSetterDeleter/utils/set_deleteVal.ts
 var set_deleteVal = (action, data, valuePath, value) => {
   if (valuePath === void 0) return;
@@ -563,121 +672,41 @@ var getValV2_getter = (data, valuePath, options, depthIdx) => {
   return dataRef[keysArray[len - 1]];
 };
 
-// src/redis/index.ts
-import IORedis from "ioredis";
-var redisClient = null;
-var REDIS_CONFIG = {
-  port: Number(process.env.REDIS_PORT),
-  host: process.env.REDIS_HOST || "",
-  username: process.env.REDIS_USERNAME || "",
-  password: process.env.REDIS_PASSWORD || ""
-};
-var connectToRedis = async () => {
-  try {
-    redisClient = new IORedis(REDIS_CONFIG);
-    await redisClient.ping();
-    console.log("Redis connected successfully");
-  } catch (error) {
-    console.error(
-      "Redis connection failed:",
-      error instanceof Error && error.message
-    );
-    if (redisClient) {
-      redisClient.disconnect();
-    }
-    throw error;
-  }
-};
-var getRedisClient = () => {
-  if (!redisClient) {
-    throw new Error("Redis client not initialized. Call connectToRedis first.");
-  }
-  return redisClient;
-};
-
-// src/redis/functions.ts
-var findInCache = async ({
-  tenant,
-  modelName,
-  type,
-  query = {}
-}) => {
-  const key = `${process.env.ENV}:${tenant}:${modelName}:${type}`;
-  try {
-    const redisClient2 = getRedisClient();
-    const value = await redisClient2.get(key);
-    if (value) {
-      return JSON.parse(value);
-    }
-  } catch (error) {
-    console.warn(
-      `redis read failed for key ${key}`,
-      error instanceof Error && error.message
-    );
+// src/utils/genTagId.ts
+var convertFromRichText = (value) => {
+  if (!value) return "";
+  let val = "";
+  if (typeof value === "string" || typeof value === "number") {
+    return String(value);
   }
-  try {
-    const collection = getDbByTenant({
-      tenant,
-      env: process.env.ENV
-    }).collection(modelName);
-    const value = await collection.findOne(query);
-    if (!value) {
-      throw new Error(`${type} value not found in ${modelName} for ${tenant}`);
-    }
-    try {
-      const redisClient2 = getRedisClient();
-      await redisClient2.set(key, JSON.stringify(value));
-    } catch (error) {
-      console.warn(
-        `redis write failed for key ${key}:`,
-        error instanceof Error && error.message
-      );
+  if (typeof value === "object" && "blocks" in value && Array.isArray(value.blocks)) {
+    for (let i = 0; i < value.blocks.length; i++) {
+      const block = value.blocks[i];
+      if (block && block.text && block.text.length > 0) {
+        val = val + block.text;
+      }
     }
-    return value;
-  } catch (error) {
-    throw new Error(
-      `db read failed:  ${error instanceof Error && error.message}`
-    );
-  }
-};
-var getTpl = async ({ name, tenant }) => {
-  if (!name || !tenant) {
-    throw new Error("Missing required parameters: name or tenant");
   }
-  return await findInCache({
-    modelName: "tpls",
-    type: name,
-    tenant,
-    query: {
-      kp_content_type: name,
-      status: { $in: ["published", "editPublished"] }
-    }
-  });
+  return val;
 };
-var getAIConfigs = async ({
-  tenant
-}) => {
-  if (!tenant) {
-    throw new Error("Missing required parameter: tenant");
-  }
-  return await findInCache({
-    modelName: "platformConfigs",
-    type: "ai",
-    tenant,
-    query: {
-      type: "ai"
-    }
-  });
+var genTagId = (tagName) => {
+  let toReturn = convertFromRichText(tagName);
+  const regex = /[^\p{L}\p{N}\+]+/gui;
+  toReturn = toReturn.trim().toLowerCase().replace(regex, "_");
+  toReturn = toReturn.replace(/\+/g, "plus");
+  return toReturn.replace(/^_+|_+$/, "");
 };
 export {
   add,
   connectToRedis,
   deleteVal,
+  genTagId,
   getAIConfigs,
   getAnnotationsModelByTenant,
   getDbByTenant,
   getModelByTenant,
   getPlatformConfigsModelByTenant,
+  getRedisClient,
   getTpl,
   getTplModelByTenant,
   getVal,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Utility functions for both browser and Node.js",
   "main": "dist/index.js",
   "module": "dist/index.mjs",