feed-common 1.51.6 → 1.52.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.52.0](https://github.com/advertikon/package-maxify-feed-common/compare/v1.51.6...v1.52.0) (2024-10-13)
+
+
+### Features
+
+* add some source tag util functions ([b53def7](https://github.com/advertikon/package-maxify-feed-common/commit/b53def7e09e6f0842766d55dc5cff84afb282b61))
+
 ## [1.51.6](https://github.com/advertikon/package-maxify-feed-common/compare/v1.51.5...v1.51.6) (2024-10-13)
 
 

package/dist/utils/utils.d.ts

@@ -1,4 +1,14 @@
-import { MacroPartType } from '../types/profile.types.js';
+import { MacroPartType, SelectItem } from '../types/profile.types.js';
 export declare function code(): string;
 export declare function parseMacrosString(textContent: string): MacroPartType[];
+export declare function isJSON(input: any): input is string;
+export declare function isSourceJSON(input: any): boolean;
+export declare function getSourceTagParts(content: string): {
+    tag: string;
+    value: string | null;
+};
+export declare function getSourceTagValue(content: string): {
+    tag: string;
+    value: SelectItem[] | null;
+};
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,wBAAgB,IAAI,WAEnB;AAED,wBAAgB,iBAAiB,CAAE,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE,CA4DvE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEtE,wBAAgB,IAAI,WAEnB;AAED,wBAAgB,iBAAiB,CAAE,WAAW,EAAE,MAAM,GAAG,aAAa,EAAE,CA4DvE;AAeD,wBAAgB,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,MAAM,CAOhD;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAYhD;AAEH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAMA;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG;IAClD,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;CAC5B,CAOA"}

package/dist/utils/utils.js

@@ -60,4 +60,36 @@ function getMacroSubtype(tagValue) {
             return 'mapping';
     }
 }
+export function isJSON(input) {
+    try {
+        JSON.parse(input);
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+}
+export function isSourceJSON(input) {
+    if (!isJSON(input)) {
+        return false;
+    }
+    const content = JSON.parse(input);
+    if (Array.isArray(content)) {
+        return content.every((item) => item?.label !== undefined && item?.value !== undefined);
+    }
+    return content?.label !== undefined && content?.value !== undefined;
+}
+export function getSourceTagParts(content) {
+    const splitPoint = content.indexOf(":");
+    const tag = splitPoint !== -1 ? content.slice(0, splitPoint) : content;
+    const value = splitPoint !== -1 ? content.slice(splitPoint + 1) : null;
+    return { tag, value };
+}
+export function getSourceTagValue(content) {
+    const splitPoint = content.indexOf(":");
+    const tag = splitPoint !== -1 ? content.slice(0, splitPoint) : content;
+    const valueText = splitPoint !== -1 ? content.slice(splitPoint + 1) : null;
+    const value = isSourceJSON(valueText) ? JSON.parse(valueText) : null;
+    return { tag, value: value && !Array.isArray(value) ? [value] : value };
+}
 //# sourceMappingURL=utils.js.map

package/dist/utils/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,IAAI;IAChB,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAE,WAAmB;IAClD,MAAM,OAAO,GAAG,IAAI,CAAC;IACrB,MAAM,QAAQ,GAAG,IAAI,CAAC;IACtB,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,KAAK,GAAoB,EAAE,CAAC;IAElC,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,OAAO;YACH;gBACI,OAAO,EAAE,EAAE;gBACX,IAAI,EAAE,QAAQ;aACjB;SACJ,CAAC;IACN,CAAC;IAED,OAAO,QAAQ,KAAK,CAAC,CAAC,IAAI,QAAQ,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;QACtD,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAE5D,IAAI,YAAY,KAAK,CAAC,CAAC,EAAE,CAAC;YACtB,KAAK,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC;gBACxC,IAAI,EAAE,QAAQ;aACjB,CAAC,CAAC;YACH,MAAM;QACV,CAAC;aAAM,IAAI,YAAY,GAAG,QAAQ,EAAE,CAAC;YACjC,KAAK,CAAC,IAAI,CAAC;gBACP,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;gBACtD,IAAI,EAAE,QAAQ;aACjB,CAAC,CAAC;QACP,CAAC;QAED,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAE/D,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CACX,oDAAoD,WAAW,mBAAmB,YAAY,EAAE,CACnG,CAAC;QACN,CAAC;QAED,wGAAwG;QACxG,MAAM,mBAAmB,GAAG,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAExF,IAAI,mBAAmB,KAAK,CAAC,CAAC,IAAI,mBAAmB,GAAG,UAAU,EAAE,CAAC;YACjE,MAAM,IAAI,KAAK,CACX,6DAA6D,WAAW,mBAAmB,YAAY,EAAE,CAC5G,CAAC;QACN,CAAC;QAED,MAAM,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC,YAAY,GAAG,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAElF,KAAK,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE;YACxB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,eAAe,CAAC,QAAQ,CAAC;SACrC,CAAC,CAAC;QAEH,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;IAC5C,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,eAAe,CAAE,QAAgB;IACtC,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpC,KAAK,QAAQ;YACT,OAAO,QAAQ,CAAC;QACpB,KAAK,WAAW;YACZ,OAAO,WAAW,CAAC;QACvB,KAAK,QAAQ;YACT,OAAO,QAAQ,CAAC;QACpB;YACI,OAAO,SAAS,CAAC;IACzB,CAAC;AACL,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feed-common",
-  "version": "1.51.6",
+  "version": "1.52.0",
   "description": "Maxify feed common library",
   "main": "dist/index.js",
   "type": "module",

package/src/utils/utils.ts

@@ -1,4 +1,4 @@
-import { MacroPartType } from '../types/profile.types.js';
+import { MacroPartType, SelectItem } from '../types/profile.types.js';
 
 export function code () {
     return (Math.random() * 1000000).toFixed(0);
@@ -78,3 +78,49 @@ function getMacroSubtype (tagValue: string): MacroPartType['subtype'] {
             return 'mapping';
     }
 }
+
+export function isJSON(input: any): input is string {
+    try {
+      JSON.parse(input);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  export function isSourceJSON(input: any): boolean {
+    if (!isJSON(input)) {
+        return false;
+    }
+
+    const content = JSON.parse(input);
+
+    if (Array.isArray(content)) {
+        return content.every((item) => item?.label !== undefined && item?.value !== undefined);
+    }
+
+    return content?.label !== undefined && content?.value !== undefined;
+  }
+
+export function getSourceTagParts(content: string): {
+    tag: string;
+    value: string | null;
+  } {
+    const splitPoint = content.indexOf(":");
+    const tag = splitPoint !== -1 ? content.slice(0, splitPoint) : content;
+    const value = splitPoint !== -1 ? content.slice(splitPoint + 1) : null;
+  
+    return { tag, value };
+  }
+
+  export function getSourceTagValue(content: string): {
+    tag: string;
+    value: SelectItem[] | null;
+  } {
+    const splitPoint = content.indexOf(":");
+    const tag = splitPoint !== -1 ? content.slice(0, splitPoint) : content;
+    const valueText = splitPoint !== -1 ? content.slice(splitPoint + 1) : null;
+    const value = isSourceJSON(valueText) ? JSON.parse(valueText as string) : null;
+  
+    return { tag, value: value && !Array.isArray(value) ? [value] : value };
+  }

package/tests/utils.spec.ts

@@ -0,0 +1,43 @@
+import { describe, test, expect } from "vitest";
+import { getSourceTagParts, getSourceTagValue, isJSON, isSourceJSON } from "../src/utils/utils";
+
+describe("Utils", () => {
+    describe('Source tag', () => {
+        test('isJson', () => {
+            expect(isJSON('{"hello": "world"}')).toBe(true);
+            expect(isJSON('[{"hello": "world"}]')).toBe(true);
+            expect(isJSON(1)).toBe(true);
+            expect(isJSON('1')).toBe(true);
+            expect(isJSON(null)).toBe(true);
+
+            expect(isJSON('{"hello": "world"')).toBe(false);
+        });
+
+        test('isSourceJSON', () => {
+            expect(isSourceJSON('{"label": "hello", "value": "world"}')).toBe(true);
+            expect(isSourceJSON('[{"label": "hello", "value": "world"}]')).toBe(true);
+
+            expect(isSourceJSON('{"label": "hello", "value": "world"')).toBe(false);
+            expect(isSourceJSON('{"label": "hello": "key": "world"}')).toBe(false);
+            expect(isSourceJSON(1)).toBe(false);
+            expect(isSourceJSON('1')).toBe(false);
+            expect(isSourceJSON(null)).toBe(false);
+        });
+
+        test('getSourceTagParts', () => {
+            expect(getSourceTagParts('source.world')).toEqual({ tag: 'source.world', value: null });
+            expect(getSourceTagParts('source.world:hello')).toEqual({ tag: 'source.world', value: 'hello' });
+            expect(getSourceTagParts('source.world:')).toEqual({ tag: 'source.world', value: '' });
+            expect(getSourceTagParts('source.world:hello:world')).toEqual({ tag: 'source.world', value: 'hello:world' });
+        })
+
+        test('getSourceTagValue', () => {
+            expect(getSourceTagValue('source.world')).toEqual({ tag: 'source.world', value: null });
+            expect(getSourceTagValue('source.world:hello')).toEqual({ tag: 'source.world', value: null });
+            expect(getSourceTagValue('source.world:hello:world')).toEqual({ tag: 'source.world', value: null });
+            expect(getSourceTagValue('source.world:')).toEqual({ tag: 'source.world', value: null });
+            expect(getSourceTagValue('source.world:{"label": "hello", "value": "world"}')).toEqual({ tag: 'source.world', value: [{ label: 'hello', value: 'world' }] });
+            expect(getSourceTagValue('source.world:[{"label": "hello", "value": "world"}]')).toEqual({ tag: 'source.world', value: [{ label: 'hello', value: 'world' }] });
+        });
+    });
+});

package/tests/validator.spec.ts

@@ -9,21 +9,19 @@ describe("Validator", () => {
         expect(hasMacro('Hello {{source.world}} {{source.world:any value}}')).toBe(false);
     });
 
-    test('language validation', () => {
-        expect(languageSchema.safeParse('en').success).toBe(true);
-        expect(languageSchema.safeParse('ES').success).toBe(true);
-        expect(languageSchema.safeParse('ES\nES').success).toBe(false);
-        expect(languageSchema.safeParse('').success).toBe(true);
-        expect(validateIfNoMacro('en', languageSchema).success).toBe(true);
-        expect(validateIfNoMacro('{{source.language:en}}', [languageSchema, z.string().min(1)]).success).toBe(true);
-        expect(validateIfNoMacro('{{source.language:foo}}', [languageSchema, z.string().min(1)]).success).toBe(false);
-        expect(validateIfNoMacro('{{source.language:}}', [languageSchema, z.string().min(2)]).success).toBe(false);
-    })
-
     test('multiple validators', () => {
-        expect(validateIfNoMacro('en', [languageSchema]).success).toBe(true);
-        expect(validateIfNoMacro('', [languageSchema]).success).toBe(true);
-        expect(validateIfNoMacro('', [languageSchema, z.string().min(1)]).success).toBe(false);
+        expect(validateIfNoMacro('en', [z.string(), z.string().min(2)]).success).toBe(true);
+        expect(validateIfNoMacro('en', [z.string(), z.string().min(3)]).success).toBe(false);
+        expect(validateIfNoMacro('en', [z.number(), z.string().min(2)]).success).toBe(false);
     });
+
+    describe('language validate', () => {
+        test('languageSchema', () => {
+            expect(languageSchema.safeParse('en').success).toBe(true);
+            expect(languageSchema.safeParse('ES').success).toBe(true);
+            expect(languageSchema.safeParse('ES\nES').success).toBe(false);
+            expect(languageSchema.safeParse('').success).toBe(true);
+        })
+    })
 });