pm-manifest 1.5.21 → 1.5.30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pm-manifest",
   "globalObject": "pm-manifest",
-  "version": "1.5.21",
+  "version": "1.5.30",
   "description": "PM manifest definition files",
   "license": "MIT",
   "repository": {

package/src/io/2-mani-output/1-convert-to-xml.ts

@@ -0,0 +1,34 @@
+import { type Mani, type FileMani, type CatalogFile } from "../../all-types";
+import { convertJsToXml } from "./7-all";
+import { prepareNewFc4Xml, prepareNewMani4Xml } from "./8-make-new-manifest-for-xml";
+
+export function convertToXmlString(params: { mani?: FileMani.Manifest, fc?: CatalogFile.Root; }): ConvertToXmlStringResult {
+    try {
+        let objForXml: object | undefined;
+
+        if (params.mani) {
+            objForXml = prepareNewMani4Xml(params.mani as Mani.Manifest);
+        } else if (params.fc) {
+            objForXml = prepareNewFc4Xml(params.fc);
+        }
+
+        if (!objForXml) {
+            return { error: 'failed to convert' };
+        }
+
+        const xml = convertJsToXml(objForXml) || '';
+        return { xml };
+    } catch (error) {
+        return { error: 'Failed to convert' + error };
+    }
+}
+
+export type ConvertToXmlStringResult =
+    | {
+        error: string;
+        xml?: undefined;
+    }
+    | {
+        xml: string;
+        error?: undefined;
+    };

package/src/io/2-mani-output/2-to-mani-file-format.ts

@@ -0,0 +1,69 @@
+import { type Mani, type FileMani, FormIdx } from "../../all-types";
+import { filterOneLevelEmptyValues } from "./8-filter-empty-values";
+
+//TODO: order is wrong
+
+export function toManiFileFormat(newMani: Partial<Mani.Manifest>): FileMani.Manifest {
+    const rv: FileMani.Manifest = {
+        descriptor: newMani.descriptor!,
+        options: newMani.options,
+        forms: newMani.forms?.map(convertForm).filter(Boolean),
+    };
+    return rv;
+}
+
+function convertForm(form: Mani.Form, idx: number): FileMani.Form {
+    let rv: FileMani.Form = {
+        fcontext: idx === FormIdx.cpass ? { type: 'pchange', name: '1', } : undefined,
+        detection: convertFormDetection(form.detection),
+        options: convertFormOptions(form.options),
+        fields: form.fields.map(convertField),
+    };
+    rv = filterOneLevelEmptyValues(rv)!;
+    return rv;
+}
+
+function convertFormDetection(detection: Mani.Detection): FileMani.Detection {
+    let rv: FileMani.Detection = {
+        ...detection as FileMani.Detection,
+        ...(detection.web_checkurl && { web_checkurl: '1' }),
+    };
+    rv = filterOneLevelEmptyValues(rv)!;
+    return rv;
+}
+
+function convertFormOptions(options: Mani.Options): FileMani.Options {
+    const rv: FileMani.Options = {
+        ...options as FileMani.Options,
+        ...(options.submittype && { submittype: options.submittype as 'dosubmit' | `nosubmit` }),
+        ...(options.autoprompt && { autoprompt: '1' }),
+    };
+    if (rv.balooncount === '3') {
+        delete rv.balooncount;
+    }
+    return filterOneLevelEmptyValues(rv)!;
+}
+
+function convertField(field: Mani.Field): FileMani.Field {
+    let rv: FileMani.Field = {
+        ...field as FileMani.Field,
+    };
+
+    convertNumbersToString(rv);
+
+    rv = filterOneLevelEmptyValues(rv)!;
+    return rv;
+}
+
+function convertNumbersToString(field: FileMani.Field) {
+    if (!!field.rfieldindex && (field.rfieldindex as any) === -1) { // mani.rfieldindex defined as string in manifest but in editor it is number
+        field.rfieldindex = '';
+    }
+
+    if (!!field.rfieldform && (field.rfieldform as any) === -1) { // mani.rfieldform defined as string in manifest but in editor it is number
+        field.rfieldform = '';
+    }
+
+    field.rfieldindex = field.rfieldindex && `${field.rfieldindex}`;
+    field.rfieldform = field.rfieldform && `${field.rfieldform}`;
+}

package/src/io/2-mani-output/{0-all.ts → 7-all.ts}

@@ -3,6 +3,19 @@ import { showError } from "../8-mani-show-error";
 import { TransformEncoding } from "../../transforms";
 import { J2xParser } from "../../utils/2-json2xml";
 
+export function convertJsToXml(obj: object | undefined): string | undefined {
+    //const rv = mani && makeNewManifest4Xml(mani);
+    if (obj) {
+        try {
+            const j2xParser = new J2xParser(parseOptionsWrite);
+            const xml = j2xParser.parse(obj);
+            return `<?xml version="1.0" encoding="UTF-8"?>\n${xml}`;
+        } catch (error) {
+            showError(error);
+        }
+    }
+}
+
 export const parseOptionsWrite = {
     ...parseOptionsRead,
     format: true,
@@ -19,17 +32,4 @@ export const parseOptionsWrite = {
     }
 };
 
-export function convertJsToXml(obj: object | undefined): string | undefined {
-    //const rv = mani && makeNewManifest4Xml(mani);
-    if (obj) {
-        try {
-            const j2xParser = new J2xParser(parseOptionsWrite);
-            const xml = j2xParser.parse(obj);
-            return `<?xml version="1.0" encoding="UTF-8"?>\n${xml}`;
-        } catch (error) {
-            showError(error);
-        }
-    }
-}
-
 //TODO: parseOptionsWrite.attrValueProcessor(): convert value life and skip '=== undefined'

package/src/io/2-mani-output/8-filter-empty-values.ts

@@ -0,0 +1,13 @@
+/**
+ * Filter empty values from the object at the top level.
+ * If the object is empty, return undefined.
+ * 
+ * TODO: This will break order of fields
+ */
+export function filterOneLevelEmptyValues<T extends Record<string, any>>(obj: T): T | undefined {
+    const entries = Object
+        .entries(obj)
+        .filter(([key, value]) => !!value);
+
+    return entries.length ? Object.fromEntries(entries) as T : undefined;
+}

package/src/io/2-mani-output/index.ts

@@ -1,2 +1,5 @@
-export * from "./0-all";
-export * from "./1-make-new-manifest-for-xml";
+export * from "./1-convert-to-xml";
+export * from "./2-to-mani-file-format";
+export * from "./7-all";
+export * from "./8-filter-empty-values";
+export * from "./8-make-new-manifest-for-xml";