jats-xml 1.0.8 → 1.0.9

package/dist/jats.cjs

@@ -13022,7 +13022,7 @@ var {
 } = import_index.default;
 
 // src/version.ts
-var version = "1.0.8";
+var version = "1.0.9";
 var version_default = version;
 
 // src/cli/parse.ts
@@ -15138,7 +15138,10 @@ var both = [
   "body",
   "sec",
   "fig",
+  "statement",
+  "list",
   "disp-formula",
+  "disp-formula-group",
   "table-wrap",
   "caption",
   "table",
@@ -15169,6 +15172,7 @@ var first = [
   "meta-value",
   "title",
   "p",
+  "license-p",
   "tr",
   "label",
   "graphic",
@@ -15569,6 +15573,42 @@ var articleMetaOrder = [
   "counts",
   "custom-meta-group"
 ];
+function order(tags) {
+  return Object.fromEntries(
+    tags.map((tag, i2) => {
+      if (typeof tag === "string")
+        return [[tag, i2]];
+      return tag.map((t2) => [t2, i2]);
+    }).flat()
+  );
+}
+var tableWrapOrder = order([
+  "object-id",
+  "label",
+  "caption",
+  "abstract",
+  "kwd-group",
+  "subj-group",
+  ["alt-text", "long-desc", "email", "ext-link", "uri"],
+  [
+    "disp-quote",
+    "speech",
+    "statement",
+    "verse-group",
+    "def-list",
+    "list",
+    "alternatives",
+    "chem-struct-wrap",
+    "code",
+    "disp-formula",
+    "graphic",
+    "media",
+    "preformat",
+    "table",
+    "xref"
+  ],
+  ["table-wrap-foot", "attrib", "permissions"]
+]);
 
 // src/jats.ts
 function select2(selector, node) {
@@ -15710,6 +15750,14 @@ var Jats = class {
         (a, b) => articleMetaOrder.findIndex((x2) => x2 === a.type) - articleMetaOrder.findIndex((x2) => x2 === b.type)
       );
     }
+    selectAll("table-wrap", this.tree).forEach((tw) => {
+      tw.children = tw.children.sort(
+        (a, b) => {
+          var _a2, _b;
+          return ((_a2 = tableWrapOrder[a.type]) != null ? _a2 : -1) - ((_b = tableWrapOrder[b.type]) != null ? _b : -1);
+        }
+      );
+    });
   }
   serialize(opts) {
     var _a;

package/dist/jats.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jats.d.ts","sourceRoot":"","sources":["../src/jats.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jats.d.ts","sourceRoot":"","sources":["../src/jats.ts"],"names":[],"mappings":"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"}

package/dist/jats.js

@@ -5,7 +5,7 @@ import { select as unistSelect, selectAll } from 'unist-util-select';
 import { Tags } from 'jats-tags';
 import { authorAndAffiliation, findArticleId } from './utils.js';
 import { tic } from 'myst-cli-utils';
-import { articleMetaOrder } from './order.js';
+import { articleMetaOrder, tableWrapOrder } from './order.js';
 import { serializeJatsXml, convertToUnist, convertToXml, toDate, } from 'jats-utils';
 function select(selector, node) {
     var _a;
@@ -146,6 +146,9 @@ export class Jats {
             this.articleMeta.children = (_a = this.articleMeta) === null || _a === void 0 ? void 0 : _a.children.sort((a, b) => articleMetaOrder.findIndex((x) => x === a.type) -
                 articleMetaOrder.findIndex((x) => x === b.type));
         }
+        selectAll('table-wrap', this.tree).forEach((tw) => {
+            tw.children = tw.children.sort((a, b) => { var _a, _b; return ((_a = tableWrapOrder[a.type]) !== null && _a !== void 0 ? _a : -1) - ((_b = tableWrapOrder[b.type]) !== null && _b !== void 0 ? _b : -1); });
+        });
     }
     serialize(opts) {
         var _a;

package/dist/order.d.ts

@@ -1,2 +1,3 @@
 export declare const articleMetaOrder: string[];
+export declare const tableWrapOrder: Record<string, number>;
 //# sourceMappingURL=order.d.ts.map

package/dist/order.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order.d.ts","sourceRoot":"","sources":["../src/order.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,UAgD5B,CAAC"}
+{"version":3,"file":"order.d.ts","sourceRoot":"","sources":["../src/order.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,gBAAgB,UAgD5B,CAAC;AAaF,eAAO,MAAM,cAAc,wBA0BzB,CAAC"}

package/dist/order.js

@@ -47,3 +47,39 @@ export const articleMetaOrder = [
     'counts',
     'custom-meta-group',
 ];
+function order(tags) {
+    return Object.fromEntries(tags
+        .map((tag, i) => {
+        if (typeof tag === 'string')
+            return [[tag, i]];
+        return tag.map((t) => [t, i]);
+    })
+        .flat());
+}
+export const tableWrapOrder = order([
+    'object-id',
+    'label',
+    'caption',
+    'abstract',
+    'kwd-group',
+    'subj-group',
+    ['alt-text', 'long-desc', 'email', 'ext-link', 'uri'],
+    [
+        'disp-quote',
+        'speech',
+        'statement',
+        'verse-group',
+        'def-list',
+        'list',
+        'alternatives',
+        'chem-struct-wrap',
+        'code',
+        'disp-formula',
+        'graphic',
+        'media',
+        'preformat',
+        'table',
+        'xref',
+    ],
+    ['table-wrap-foot', 'attrib', 'permissions'],
+]);

package/dist/version.d.ts

@@ -1,3 +1,3 @@
-declare const version = "1.0.8";
+declare const version = "1.0.9";
 export default version;
 //# sourceMappingURL=version.d.ts.map

package/dist/version.js

@@ -1,2 +1,2 @@
-const version = '1.0.8';
+const version = '1.0.9';
 export default version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jats-xml",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Types and utilities for working with JATS in Typescript",
   "author": "Rowan Cockett <rowan@curvenote.com>",
   "homepage": "https://github.com/curvenote/jats",
@@ -48,9 +48,9 @@
     "adm-zip": "^0.5.10",
     "doi-utils": "^2.0.0",
     "fair-principles": "^2.0.0",
-    "jats-fetch": "^1.0.8",
-    "jats-tags": "^1.0.8",
-    "jats-utils": "^1.0.8",
+    "jats-fetch": "^1.0.9",
+    "jats-tags": "^1.0.9",
+    "jats-utils": "^1.0.9",
     "js-yaml": "^4.1.0",
     "node-fetch": "^3.3.1",
     "unist-util-is": "^5.2.1",