@tmagic/utils 1.3.5 → 1.3.7

package/src/index.ts

@@ -135,6 +135,11 @@ export const isPage = (node?: MComponent | null): boolean => {
   return Boolean(node.type?.toLowerCase() === NodeType.PAGE);
 };
 
+export const isPageFragment = (node?: MComponent | null): boolean => {
+  if (!node) return false;
+  return Boolean(node.type?.toLowerCase() === NodeType.PAGE_FRAGMENT);
+};
+
 export const isNumber = (value: string) => /^(-?\d+)(\.\d+)?$/.test(value);
 
 export const getHost = (targetUrl: string) => targetUrl.match(/\/\/([^/]+)/)?.[1];
@@ -296,49 +301,37 @@ export const compiledNode = (
   return node;
 };
 
-export const compiledCond = (op: string, fieldValue: any, value: any, range: [number, number]): boolean => {
+export const compiledCond = (op: string, fieldValue: any, value: any, range: number[] = []): boolean => {
   switch (op) {
     case 'is':
-      if (fieldValue !== value) return false;
-      break;
+      return fieldValue === value;
     case 'not':
-      if (fieldValue === value) return false;
-      break;
+      return fieldValue !== value;
     case '=':
-      if (fieldValue !== value) return false;
-      break;
+      return fieldValue === value;
     case '!=':
-      if (fieldValue === value) return false;
-      break;
+      return fieldValue !== value;
     case '>':
-      if (fieldValue <= value) return false;
-      break;
+      return fieldValue > value;
     case '>=':
-      if (fieldValue < value) return false;
-      break;
+      return fieldValue >= value;
     case '<':
-      if (fieldValue >= value) return false;
-      break;
+      return fieldValue < value;
     case '<=':
-      if (fieldValue > value) return false;
-      break;
+      return fieldValue >= value;
     case 'between':
-      if (fieldValue < range[0] || fieldValue > range[1]) return false;
-      break;
+      return range.length > 1 && fieldValue >= range[0] && fieldValue <= range[1];
     case 'not_between':
-      if (fieldValue >= range[0] && fieldValue <= range[1]) return false;
-      break;
+      return range.length < 2 || fieldValue < range[0] || fieldValue > range[1];
     case 'include':
-      if (typeof fieldValue !== 'undefined' && !fieldValue.includes?.(value)) return false;
-      break;
+      return fieldValue?.includes?.(value);
     case 'not_include':
-      if (typeof fieldValue !== 'undefined' && fieldValue.includes?.(value)) return false;
-      break;
+      return typeof fieldValue === 'undefined' || !fieldValue.includes?.(value);
     default:
       break;
   }
 
-  return true;
+  return false;
 };
 
 export const getDefaultValueFromFields = (fields: DataSchema[]) => {

package/types/index.d.ts

@@ -17,6 +17,7 @@ export declare const getUrlParam: (param: string, url?: string) => string;
 export declare const isObject: (obj: any) => boolean;
 export declare const isPop: (node: MComponent | null) => boolean;
 export declare const isPage: (node?: MComponent | null) => boolean;
+export declare const isPageFragment: (node?: MComponent | null) => boolean;
 export declare const isNumber: (value: string) => boolean;
 export declare const getHost: (targetUrl: string) => string | undefined;
 export declare const isSameDomain: (targetUrl?: string, source?: string) => boolean;
@@ -38,7 +39,7 @@ export declare const getDepNodeIds: (dataSourceDeps?: DataSourceDeps) => string[
  */
 export declare const replaceChildNode: (newNode: MNode, data?: MNode[], parentId?: Id) => void;
 export declare const compiledNode: (compile: (value: any) => any, node: MNode, dataSourceDeps?: DataSourceDeps, sourceId?: Id) => MNode;
-export declare const compiledCond: (op: string, fieldValue: any, value: any, range: [number, number]) => boolean;
+export declare const compiledCond: (op: string, fieldValue: any, value: any, range?: number[]) => boolean;
 export declare const getDefaultValueFromFields: (fields: DataSchema[]) => Record<string, any>;
 export declare const DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX = "ds-field::";
 export declare const getKeys: <T extends object>(obj: T) => (keyof T)[];