@biblioteksentralen/marc 0.2.0 → 0.4.0

package/README.md

@@ -103,4 +103,6 @@ const result = validate(record.toJSON());
 
 ## Changelog
 
+- 0.4.0: Line MARC serialization: Remove linebreaks and trim surrounding whitespace
+- 0.3.0: Upgrade to Zod 4
 - 0.2.0: Removed the logger argument from `MarcRecord.fromJSON()`.

package/dist/index.cjs

@@ -247,14 +247,18 @@ function serializeMarcXmlCollection(input, pretty = false) {
 }
 
 // src/marc-record/serializeLineMarc.ts
-function serializeLineMarc(input) {
+var BIBLIOFIL_DOLLAR_ESCAPE_CHARACTER = "@{2}";
+function serializeLineMarc(input, options = {}) {
+  const serializer = createDefaultSerializer({
+    dollarEscapeCharacter: options.dollarEscapeCharacter ?? BIBLIOFIL_DOLLAR_ESCAPE_CHARACTER
+  });
   const leader = serializer.leader(input.leader);
   const control = input.getControlFields().map(serializer.controlfield).join("");
   const data = input.getDataFields().map(serializer.datafield).join("");
   return `${leader}${control}${data}^
 `;
 }
-var serializer = {
+var createDefaultSerializer = (options) => ({
   leader: (leader) => `*LDR${leader}
 `,
   controlfield: (field) => `*${field.tag}${field.value}
@@ -263,14 +267,14 @@ var serializer = {
     const ind1 = field.ind1 ?? " ";
     const ind2 = field.ind2 ?? " ";
     const subfields = field.subfields.map(
-      (subfield) => `$${subfield.code}${escapeSubfieldValue(subfield.value)}`
+      (subfield) => `$${subfield.code}${escapeSubfieldValue(subfield.value, options)}`
     ).join("");
     return `*${field.tag}${ind1}${ind2}${subfields}
 `;
   }
-};
-var escapeSubfieldValue = (value) => {
-  return value.replace(/\n/g, " ").replace(/\$/g, "@{2}");
+});
+var escapeSubfieldValue = (value, options) => {
+  return value.replace(/[\n|\r]/g, " ").replace(/\s\s+/g, " ").replace(/\$/g, options.dollarEscapeCharacter).trim();
 };
 
 // src/marc-record/MarcRecord.ts

package/dist/index.d.cts

@@ -139,79 +139,28 @@ declare function parseMarcXml(input: string | XmlElement, options?: MarcXmlOptio
 declare const marcRecordZodSchema: z.ZodObject<{
     format: z.ZodOptional<z.ZodString>;
     leader: z.ZodString;
-    fields: z.ZodArray<z.ZodUnion<[z.ZodObject<{
+    fields: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
         tag: z.ZodString;
         value: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        tag: string;
-        value: string;
-    }, {
-        tag: string;
-        value: string;
-    }>, z.ZodObject<{
+    }, z.core.$strip>, z.ZodObject<{
         tag: z.ZodString;
         ind1: z.ZodOptional<z.ZodString>;
         ind2: z.ZodOptional<z.ZodString>;
         subfields: z.ZodArray<z.ZodObject<{
             code: z.ZodString;
             value: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            value: string;
-            code: string;
-        }, {
-            value: string;
-            code: string;
-        }>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        tag: string;
-        subfields: {
-            value: string;
-            code: string;
-        }[];
-        ind1?: string | undefined;
-        ind2?: string | undefined;
-    }, {
-        tag: string;
-        subfields: {
-            value: string;
-            code: string;
-        }[];
-        ind1?: string | undefined;
-        ind2?: string | undefined;
-    }>]>, "many">;
-}, "strip", z.ZodTypeAny, {
-    fields: ({
-        tag: string;
-        value: string;
-    } | {
-        tag: string;
-        subfields: {
-            value: string;
-            code: string;
-        }[];
-        ind1?: string | undefined;
-        ind2?: string | undefined;
-    })[];
-    leader: string;
-    format?: string | undefined;
-}, {
-    fields: ({
-        tag: string;
-        value: string;
-    } | {
-        tag: string;
-        subfields: {
-            value: string;
-            code: string;
-        }[];
-        ind1?: string | undefined;
-        ind2?: string | undefined;
-    })[];
-    leader: string;
-    format?: string | undefined;
-}>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>]>>;
+}, z.core.$strip>;
 
-declare function serializeLineMarc(input: MarcRecord): string;
+type SerializeLineMarcOptions = {
+    /**
+     * Replacement character to use for $ characters in field values.
+     * Defaults to `@{2}`
+     */
+    dollarEscapeCharacter: string;
+};
+declare function serializeLineMarc(input: MarcRecord, options?: Partial<SerializeLineMarcOptions>): string;
 
 declare function serializeMarcXml(input: MarcRecord, pretty?: boolean): string;
 declare function serializeMarcXmlCollection(input: MarcRecord[], pretty?: boolean): string;

package/dist/index.d.ts

@@ -139,79 +139,28 @@ declare function parseMarcXml(input: string | XmlElement, options?: MarcXmlOptio
 declare const marcRecordZodSchema: z.ZodObject<{
     format: z.ZodOptional<z.ZodString>;
     leader: z.ZodString;
-    fields: z.ZodArray<z.ZodUnion<[z.ZodObject<{
+    fields: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
         tag: z.ZodString;
         value: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        tag: string;
-        value: string;
-    }, {
-        tag: string;
-        value: string;
-    }>, z.ZodObject<{
+    }, z.core.$strip>, z.ZodObject<{
         tag: z.ZodString;
         ind1: z.ZodOptional<z.ZodString>;
         ind2: z.ZodOptional<z.ZodString>;
         subfields: z.ZodArray<z.ZodObject<{
             code: z.ZodString;
             value: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            value: string;
-            code: string;
-        }, {
-            value: string;
-            code: string;
-        }>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        tag: string;
-        subfields: {
-            value: string;
-            code: string;
-        }[];
-        ind1?: string | undefined;
-        ind2?: string | undefined;
-    }, {
-        tag: string;
-        subfields: {
-            value: string;
-            code: string;
-        }[];
-        ind1?: string | undefined;
-        ind2?: string | undefined;
-    }>]>, "many">;
-}, "strip", z.ZodTypeAny, {
-    fields: ({
-        tag: string;
-        value: string;
-    } | {
-        tag: string;
-        subfields: {
-            value: string;
-            code: string;
-        }[];
-        ind1?: string | undefined;
-        ind2?: string | undefined;
-    })[];
-    leader: string;
-    format?: string | undefined;
-}, {
-    fields: ({
-        tag: string;
-        value: string;
-    } | {
-        tag: string;
-        subfields: {
-            value: string;
-            code: string;
-        }[];
-        ind1?: string | undefined;
-        ind2?: string | undefined;
-    })[];
-    leader: string;
-    format?: string | undefined;
-}>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>]>>;
+}, z.core.$strip>;
 
-declare function serializeLineMarc(input: MarcRecord): string;
+type SerializeLineMarcOptions = {
+    /**
+     * Replacement character to use for $ characters in field values.
+     * Defaults to `@{2}`
+     */
+    dollarEscapeCharacter: string;
+};
+declare function serializeLineMarc(input: MarcRecord, options?: Partial<SerializeLineMarcOptions>): string;
 
 declare function serializeMarcXml(input: MarcRecord, pretty?: boolean): string;
 declare function serializeMarcXmlCollection(input: MarcRecord[], pretty?: boolean): string;

package/dist/index.js

@@ -245,14 +245,18 @@ function serializeMarcXmlCollection(input, pretty = false) {
 }
 
 // src/marc-record/serializeLineMarc.ts
-function serializeLineMarc(input) {
+var BIBLIOFIL_DOLLAR_ESCAPE_CHARACTER = "@{2}";
+function serializeLineMarc(input, options = {}) {
+  const serializer = createDefaultSerializer({
+    dollarEscapeCharacter: options.dollarEscapeCharacter ?? BIBLIOFIL_DOLLAR_ESCAPE_CHARACTER
+  });
   const leader = serializer.leader(input.leader);
   const control = input.getControlFields().map(serializer.controlfield).join("");
   const data = input.getDataFields().map(serializer.datafield).join("");
   return `${leader}${control}${data}^
 `;
 }
-var serializer = {
+var createDefaultSerializer = (options) => ({
   leader: (leader) => `*LDR${leader}
 `,
   controlfield: (field) => `*${field.tag}${field.value}
@@ -261,14 +265,14 @@ var serializer = {
     const ind1 = field.ind1 ?? " ";
     const ind2 = field.ind2 ?? " ";
     const subfields = field.subfields.map(
-      (subfield) => `$${subfield.code}${escapeSubfieldValue(subfield.value)}`
+      (subfield) => `$${subfield.code}${escapeSubfieldValue(subfield.value, options)}`
     ).join("");
     return `*${field.tag}${ind1}${ind2}${subfields}
 `;
   }
-};
-var escapeSubfieldValue = (value) => {
-  return value.replace(/\n/g, " ").replace(/\$/g, "@{2}");
+});
+var escapeSubfieldValue = (value, options) => {
+  return value.replace(/[\n|\r]/g, " ").replace(/\s\s+/g, " ").replace(/\$/g, options.dollarEscapeCharacter).trim();
 };
 
 // src/marc-record/MarcRecord.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biblioteksentralen/marc",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "private": false,
   "type": "module",
   "description": "MARC record parser and serializer",
@@ -26,13 +26,13 @@
   ],
   "dependencies": {
     "ajv": "^8.17.1",
-    "zod": "^3.23.8",
+    "zod": "^4.3.6",
     "@biblioteksentralen/xml-utils": "^0.0.3"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.4",
     "@types/json-schema": "^7.0.15",
-    "@types/node": "^22.15.3",
+    "@types/node": "^24.11.0",
     "eslint": "^9.26.0",
     "rimraf": "^5.0.5",
     "tsup": "^8.0.2",