corebasic 1.0.258 → 1.0.260

package/dist/libs/features.js

@@ -92,7 +92,7 @@ export const send = async (meta, feature, data, params) => {
     let url = getFeatureUrl(api);
     if (params || url.includes(':')) {
         for (let key in params)
-            url = url.replace(`:${key}`, params[key]);
+            url = url.replace(`:${key}`, encodeURIComponent(params[key]));
         if (url.includes(':'))
             throw new Error(`Error: Internal feature call send on feature: ${feature} when api/params/substitution`);
     }
@@ -103,7 +103,7 @@ export const send = async (meta, feature, data, params) => {
     // return  (await axios[method](`${service}${url}`, payload, {headers: {jwt: SERVICE_ACCESS_TOKEN, service: true}, timeout: 1000 })).data // Worked Earlier, but issue spotted
     if (baseFeature) { // Local call
         let response;
-        let req = { body: payload, params: params ?? {}, method, path: url, url: '', headers: {}, query: {}, on: (_event, _callback) => { } };
+        let req = { body: payload, params: params ?? {}, method, path: decodeURIComponent(url), url: '', headers: {}, query: {}, on: (_event, _callback) => { } };
         req = JSON.parse(JSON.stringify(req));
         const callback = (payload) => { response = payload; };
         const res = {
@@ -182,10 +182,29 @@ const apiHandler = async (req, res) => {
             meta.outlet = 'DEFAULT_OUTLET';
         }
         meta.txn = meta.txn ?? Utils.uid();
+        function buildQuery(key, id) {
+            key = key ? key : "_id";
+            const array_paths = key.split(".$.");
+            const last_path = array_paths.pop();
+            const query = {};
+            let obj = query;
+            for (const path of array_paths) {
+                obj[path] = { $elemMatch: {} };
+                obj = obj[path].$elemMatch;
+            }
+            if (last_path?.endsWith(".$"))
+                obj[last_path.split(".$")[0]] = { $elemMatch: { $eq: id } };
+            else if (last_path)
+                obj[last_path] = id;
+            else
+                return undefined;
+            return query;
+        }
         const message = {
             meta,
             data: req.body.data,
             params: featureless ? req.params : req.body.params,
+            query: req.body.params?.key && (feature.key)?.includes(req.body.params?.key) ? buildQuery(req.body.params?.key ?? "_id", req.body.params?.id) : req.body.params?.id ? { _id: req.body.params?.id } : undefined
         };
         const appReq = {
             meta: message.meta,

package/libs/features.ts

@@ -63,6 +63,7 @@ type FeatureMessage<I = unknown, T extends keyof Schema = keyof Schema> = {
     meta: FeatureMeta & { topic: T }
     data: I
     params: FeatureParams
+    query?: unknown // This is the buildQuery not the express query
 
     // feature // Only used as req.body.feature in features.ts, session.ts
     // client  // Only used as req.body.client in auth.ts, session.ts and messaging.ts
@@ -143,7 +144,7 @@ type RemoteFeatureEntry = {
     headers?: {JWT?: string, service?: boolean, NDCURVE_DEVELOPER_LICENSE_ACCESS_TOKEN?: string}
 }
 
-type FeatureEntry = { api: string, topic: string, bypass: boolean, featureless: boolean, subscribe: string, handler: Handler<unknown, unknown, keyof Schema> }
+type FeatureEntry = { api: string, topic: string, bypass: boolean, featureless: boolean, subscribe: string, handler: Handler<unknown, unknown, keyof Schema>, key?: string[] }
 
 
 let features: Record<string, FeatureEntry> = {}
@@ -203,7 +204,7 @@ export const send = async <K extends keyof FeatureTypes> (meta: Partial<FeatureM
 
     if (params || url.includes(':')) {
         for (let key in params)
-            url = url.replace(`:${key}`, params[key]!)
+            url = url.replace(`:${key}`, encodeURIComponent(params[key]!))
         if (url.includes(':'))
             throw new Error(`Error: Internal feature call send on feature: ${feature} when api/params/substitution`)
     }
@@ -217,7 +218,7 @@ export const send = async <K extends keyof FeatureTypes> (meta: Partial<FeatureM
     // return  (await axios[method](`${service}${url}`, payload, {headers: {jwt: SERVICE_ACCESS_TOKEN, service: true}, timeout: 1000 })).data // Worked Earlier, but issue spotted
     if (baseFeature) { // Local call
         let response;
-        let req: ExpressRequest = { body: payload, params: params ?? {}, method, path: url, url: '', headers: {}, query: {}, on: (_event: string, _callback:()=>void) => {} }
+        let req: ExpressRequest = { body: payload, params: params ?? {}, method, path: decodeURIComponent(url), url: '', headers: {}, query: {}, on: (_event: string, _callback:()=>void) => {} }
         req = JSON.parse(JSON.stringify(req))
         const callback = (payload: unknown): void => { response = payload }
         const res: ExpressResponse = {
@@ -309,10 +310,32 @@ const apiHandler = async (req: ExpressRequest, res: ExpressResponse) => {
 
         meta.txn = meta.txn ?? Utils.uid()
 
+
+        function buildQuery(key: string, id: unknown): unknown {
+            key = key ? key : "_id"
+            const array_paths = key.split(".$.")
+            const last_path = array_paths.pop()
+            const query: Record<string, unknown> = {}
+            let obj = query
+            for (const path of array_paths) {
+                obj[path] = { $elemMatch: {  } }
+                obj = (obj[path] as { $elemMatch: Record<string, unknown> }).$elemMatch
+            }
+
+            if (last_path?.endsWith(".$"))
+                obj[last_path.split(".$")[0]!] = { $elemMatch: {$eq: id} }
+            else if (last_path)
+                obj[last_path] = id
+            else
+                return undefined
+            return query
+        }
+
         const message: FeatureMessage = {
             meta,
             data: req.body.data,
             params: featureless ? req.params : req.body.params!,
+            query: req.body.params?.key && (feature.key!)?.includes(req.body.params?.key as string) ? buildQuery(req.body.params?.key ?? "_id", req.body.params?.id) : req.body.params?.id ? {_id: req.body.params?.id} : undefined
         }
 
         const appReq: Req = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "corebasic",
   "type": "module",
-  "version": "1.0.258",
+  "version": "1.0.260",
   "description": "",
   "main": "dist/index.js",
   "types": "./index.ts",