@biblioteksentralen/marc 0.0.3 → 0.0.5

package/dist/index.cjs

@@ -199,9 +199,10 @@ var MarcRecord = class _MarcRecord {
     this.leader = leader;
     this.fields = fields;
   }
-  static fromJSON(data) {
+  static fromJSON(data, log) {
     const { format, leader, fields } = this.validateJSON(
-      fixInvalidMarcRecordSerialization(data)
+      fixInvalidMarcRecordSerialization(data),
+      log
     );
     return new _MarcRecord({
       leader,
@@ -211,10 +212,16 @@ var MarcRecord = class _MarcRecord {
       )
     });
   }
-  static validateJSON(data) {
+  static validateJSON(data, log) {
     if (validator(data)) {
       return data;
     }
+    log.error(
+      `MarcRecord validation failed:
+${validator.errors ? JSON.stringify(validator.errors) : "Unknown error"}.
+Data:
+${JSON.stringify(data)}`
+    );
     throw new ValidationFailed(validator.errors ?? []);
   }
   getControlFields() {
@@ -346,7 +353,7 @@ function serializeLineMarc(input) {
 `;
 }
 var serializer = {
-  leader: (leader) => `*LDR ${leader}
+  leader: (leader) => `*LDR${leader}
 `,
   controlfield: (field) => `*${field.tag}${field.value}
 `,
@@ -361,7 +368,7 @@ var serializer = {
   }
 };
 var escapeSubfieldValue = (value) => {
-  return value.replace(/\$/g, "$$");
+  return value.replace(/\n/g, " ").replace(/\$/g, "@{2}");
 };
 function serializeMarcXml(input, pretty = false) {
   const fields = [

package/dist/index.d.cts

@@ -1,4 +1,5 @@
 import { XmlElement } from '@biblioteksentralen/xml-utils';
+import { Logger } from 'ts-log';
 import { z } from 'zod';
 
 type SerializedMarcField = SerializedDataField | SerializedControlField;
@@ -73,8 +74,8 @@ declare class MarcRecord {
         fields: MarcField[];
         format?: string;
     });
-    static fromJSON(data: unknown): MarcRecord;
-    static validateJSON(data: unknown): SerializedMarcRecord;
+    static fromJSON(data: unknown, log: Logger): MarcRecord;
+    static validateJSON(data: unknown, log: Logger): SerializedMarcRecord;
     getControlFields(): ControlField[];
     getControlField(tag: string): ControlField | undefined;
     getDataFields(tag?: string | RegExp, indicators?: Indicators): DataField[];

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { XmlElement } from '@biblioteksentralen/xml-utils';
+import { Logger } from 'ts-log';
 import { z } from 'zod';
 
 type SerializedMarcField = SerializedDataField | SerializedControlField;
@@ -73,8 +74,8 @@ declare class MarcRecord {
         fields: MarcField[];
         format?: string;
     });
-    static fromJSON(data: unknown): MarcRecord;
-    static validateJSON(data: unknown): SerializedMarcRecord;
+    static fromJSON(data: unknown, log: Logger): MarcRecord;
+    static validateJSON(data: unknown, log: Logger): SerializedMarcRecord;
     getControlFields(): ControlField[];
     getControlField(tag: string): ControlField | undefined;
     getDataFields(tag?: string | RegExp, indicators?: Indicators): DataField[];

package/dist/index.js

@@ -197,9 +197,10 @@ var MarcRecord = class _MarcRecord {
     this.leader = leader;
     this.fields = fields;
   }
-  static fromJSON(data) {
+  static fromJSON(data, log) {
     const { format, leader, fields } = this.validateJSON(
-      fixInvalidMarcRecordSerialization(data)
+      fixInvalidMarcRecordSerialization(data),
+      log
     );
     return new _MarcRecord({
       leader,
@@ -209,10 +210,16 @@ var MarcRecord = class _MarcRecord {
       )
     });
   }
-  static validateJSON(data) {
+  static validateJSON(data, log) {
     if (validator(data)) {
       return data;
     }
+    log.error(
+      `MarcRecord validation failed:
+${validator.errors ? JSON.stringify(validator.errors) : "Unknown error"}.
+Data:
+${JSON.stringify(data)}`
+    );
     throw new ValidationFailed(validator.errors ?? []);
   }
   getControlFields() {
@@ -344,7 +351,7 @@ function serializeLineMarc(input) {
 `;
 }
 var serializer = {
-  leader: (leader) => `*LDR ${leader}
+  leader: (leader) => `*LDR${leader}
 `,
   controlfield: (field) => `*${field.tag}${field.value}
 `,
@@ -359,7 +366,7 @@ var serializer = {
   }
 };
 var escapeSubfieldValue = (value) => {
-  return value.replace(/\$/g, "$$");
+  return value.replace(/\n/g, " ").replace(/\$/g, "@{2}");
 };
 function serializeMarcXml(input, pretty = false) {
   const fields = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biblioteksentralen/marc",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "private": false,
   "type": "module",
   "description": "MARC record parser and serializer",
@@ -28,23 +28,23 @@
     "ajv": "^8.17.1",
     "ts-log": "^2.2.5",
     "zod": "^3.23.8",
-    "@biblioteksentralen/xml-utils": "^0.0.1"
+    "@biblioteksentralen/xml-utils": "^0.0.3"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.4",
     "@types/json-schema": "^7.0.15",
-    "@types/node": "^20.14.14",
-    "@vitest/coverage-v8": "^1.5.0",
+    "@types/node": "^22.15.3",
+    "eslint": "^9.26.0",
     "rimraf": "^5.0.5",
     "tsup": "^8.0.2",
     "typescript": "^5.6.2",
-    "vitest": "^1.5.0",
+    "vitest": "^3.1.2",
     "@dataplattform/eslint-config": "1.0.0"
   },
   "scripts": {
-    "dev": "tsc -p tsconfig.build.json --watch --preserveWatchOutput",
+    "dev": "tsup src/index.ts --format cjs,esm --dts --treeshake --watch",
     "build": "tsup src/index.ts --format cjs,esm --dts --treeshake",
-    "test": "vitest run --poolOptions.threads.singleThread --reporter=verbose --coverage",
+    "test": "vitest run --poolOptions.threads.singleThread --reporter=verbose",
     "test:watch": "vitest",
     "clean": "rimraf dist",
     "lint": "eslint .",