jats-utils 1.1.0 → 1.1.2

package/dist/utils.d.ts

@@ -1,6 +1,9 @@
 import type { GenericNode, GenericParent } from 'myst-common';
 import type { Element } from 'xml-js';
-export declare function convertToUnist(node: Element): GenericNode | GenericParent | undefined;
+export type ConvertToUnistContext = {
+    insidePreformat?: boolean;
+};
+export declare function convertToUnist(node: Element, ctx?: ConvertToUnistContext): GenericNode | GenericParent | undefined;
 export declare function convertToXml(node: GenericNode): Element;
 export declare function escapeForXML(text: string): string;
 export declare function toDate(date?: GenericParent): Date | undefined;

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,wBAAgB,cAAc,CAAC,IAAI,EAAE,OAAO,GAAG,WAAW,GAAG,aAAa,GAAG,SAAS,CA2CrF;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAwBvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,UAExC;AA6BD,wBAAgB,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,SAAS,CAa7D;AAED,wBAAgB,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,sBAGrC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,MAAM,MAAM,qBAAqB,GAAG;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAElE,wBAAgB,cAAc,CAC5B,IAAI,EAAE,OAAO,EACb,GAAG,CAAC,EAAE,qBAAqB,GAC1B,WAAW,GAAG,aAAa,GAAG,SAAS,CAqDzC;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAwBvD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,UAExC;AA6BD,wBAAgB,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,SAAS,CAa7D;AAED,wBAAgB,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,sBAGrC"}

package/dist/utils.js

@@ -1,10 +1,13 @@
 import { toText } from 'myst-common';
 import { select } from 'unist-util-select';
-export function convertToUnist(node) {
+export function convertToUnist(node, ctx) {
+    var _a;
+    const insidePreformat = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.insidePreformat) !== null && _a !== void 0 ? _a : false;
     switch (node.type) {
         case 'element': {
             const { name, attributes, elements } = node;
-            const children = elements === null || elements === void 0 ? void 0 : elements.map(convertToUnist).filter((n) => !!n);
+            const nextInside = insidePreformat || name === 'preformat';
+            const children = elements === null || elements === void 0 ? void 0 : elements.map((el) => convertToUnist(el, { insidePreformat: nextInside })).filter((n) => !!n);
             const { type, ...attrs } = attributes !== null && attributes !== void 0 ? attributes : {};
             if (type !== undefined)
                 attrs._type = type;
@@ -18,18 +21,24 @@ export function convertToUnist(node) {
         }
         case 'text': {
             const { attributes, text } = node;
+            const raw = String(text);
+            if (!insidePreformat && !raw.trim()) {
+                return undefined;
+            }
+            const value = insidePreformat ? raw : raw.replace(/\n(\s+)$/, '');
             return {
                 type: 'text',
                 ...attributes,
-                value: String(text).replace(/\n(\s+)$/, ''),
+                value,
             };
         }
         case 'cdata': {
             const { attributes, cdata } = node;
+            const str = String(cdata);
             return {
                 type: 'cdata',
                 ...attributes,
-                cdata: String(cdata).trim(),
+                cdata: insidePreformat ? str : str.trim(),
             };
         }
         case 'comment': {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "jats-utils",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Utility functions for working with JATS in Typescript",
-  "author": "Rowan Cockett <rowan@continuous.foundation>",
+  "author": "Rowan Cockett <rowan@continuousfoundation.org>",
   "homepage": "https://github.com/continuous-foundation/jats",
   "license": "MIT",
   "sideEffects": false,
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "unist-util-select": "^4.0.0",
-    "jats-tags": "^1.1.0"
+    "jats-tags": "^1.1.2"
   },
   "peerDependencies": {
     "xml-js": "^1"