meca 1.0.6 → 1.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/manifest.d.ts.map +1 -1
- package/dist/manifest.js +3 -2
- package/dist/meca.cjs +5 -6
- package/dist/transfer.d.ts +2 -2
- package/dist/transfer.d.ts.map +1 -1
- package/dist/transfer.js +2 -1
- package/dist/validate.d.ts.map +1 -1
- package/dist/validate.js +1 -2
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +4 -2
package/dist/manifest.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../src/manifest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAG7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAI7C,eAAO,MAAM,QAAQ,iBAAiB,CAAC;AACvC,eAAO,MAAM,YAAY,qBAAqB,CAAC;AAE/C,KAAK,OAAO,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD,oBAAY,SAAS;IACnB,eAAe,qBAAqB;IACpC,qBAAqB,4BAA4B;IACjD,UAAU,eAAe;IACzB,wBAAwB,+BAA+B;IACvD,aAAa,mBAAmB;IAChC,wBAAwB,+BAA+B;IACvD,sBAAsB,6BAA6B;IACnD,gBAAgB,sBAAsB;CACvC;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,qBAAa,WAAW;IACtB,WAAW,CAAC,EAAE,qBAAqB,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;gBAEJ,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO;IAuBxC,IAAI,QAAQ,IAAI,MAAM,CAOrB;IAEK,WAAW,CAAC,SAAS,CAAC,EAAE,MAAM;IAqBpC,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,KAAK,IAAI,YAAY,EAAE,CAmC1B;IAED,IAAI,SAAS,IAAI,MAAM,EAAE,CAMxB;IAED,IAAI,eAAe,IAAI,YAAY,GAAG,SAAS,CAI9C;IAED,IAAI,gBAAgB,IAAI,YAAY,EAAE,CAErC;CACF;AAED,KAAK,YAAY,GAAG;IAClB,kFAAkF;IAClF,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAuCF,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE,IAAI,CAAC,EAAE,YAAY,UA4BnF"}
|
package/dist/manifest.js
CHANGED
|
@@ -10,7 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
import fs from 'node:fs';
|
|
11
11
|
import path from 'node:path';
|
|
12
12
|
import { js2xml, xml2js } from 'xml-js';
|
|
13
|
-
import { convertToUnist
|
|
13
|
+
import { convertToUnist } from 'jats-utils';
|
|
14
|
+
import { xmllintValidate } from 'jats-xml';
|
|
14
15
|
import { tic } from 'myst-cli-utils';
|
|
15
16
|
import { createTempFolder, elementWithText, removeTempFolder, select, selectAll } from './utils.js';
|
|
16
17
|
export const MANIFEST = 'manifest.xml';
|
|
@@ -161,8 +162,8 @@ function writeManifestItem(item, opts) {
|
|
|
161
162
|
type: 'element',
|
|
162
163
|
name: 'instance',
|
|
163
164
|
attributes: {
|
|
164
|
-
[(opts === null || opts === void 0 ? void 0 : opts.noXLink) ? 'href' : 'xlink:href']: href,
|
|
165
165
|
'media-type': mediaType,
|
|
166
|
+
[(opts === null || opts === void 0 ? void 0 : opts.noXLink) ? 'href' : 'xlink:href']: href,
|
|
166
167
|
},
|
|
167
168
|
},
|
|
168
169
|
].filter((e) => !!e),
|
package/dist/meca.cjs
CHANGED
|
@@ -13042,7 +13042,7 @@ var {
|
|
|
13042
13042
|
} = import_index.default;
|
|
13043
13043
|
|
|
13044
13044
|
// src/version.ts
|
|
13045
|
-
var version = "1.0.
|
|
13045
|
+
var version = "1.0.8";
|
|
13046
13046
|
var version_default = version;
|
|
13047
13047
|
|
|
13048
13048
|
// ../../node_modules/myst-cli-utils/node_modules/chalk/source/vendor/ansi-styles/index.js
|
|
@@ -14154,14 +14154,14 @@ function createState(selector, tree) {
|
|
|
14154
14154
|
};
|
|
14155
14155
|
}
|
|
14156
14156
|
|
|
14157
|
-
// ../jats-
|
|
14157
|
+
// ../jats-utils/dist/utils.js
|
|
14158
14158
|
function convertToUnist(node) {
|
|
14159
14159
|
switch (node.type) {
|
|
14160
14160
|
case "element": {
|
|
14161
14161
|
const { name: name2, attributes, elements } = node;
|
|
14162
14162
|
const children = elements === null || elements === void 0 ? void 0 : elements.map(convertToUnist).filter((n) => !!n);
|
|
14163
14163
|
const { type, ...attrs } = attributes !== null && attributes !== void 0 ? attributes : {};
|
|
14164
|
-
if (type)
|
|
14164
|
+
if (type !== void 0)
|
|
14165
14165
|
attrs._type = type;
|
|
14166
14166
|
const next = { type: name2 !== null && name2 !== void 0 ? name2 : "unknown", ...attrs };
|
|
14167
14167
|
if (name2 === "code") {
|
|
@@ -14175,7 +14175,7 @@ function convertToUnist(node) {
|
|
|
14175
14175
|
return {
|
|
14176
14176
|
type: "text",
|
|
14177
14177
|
...attributes,
|
|
14178
|
-
value: String(text).replace(/\n(\s+)$/, "")
|
|
14178
|
+
value: String(text).replace(/\n(\s+)$/, "")
|
|
14179
14179
|
};
|
|
14180
14180
|
}
|
|
14181
14181
|
case "cdata": {
|
|
@@ -17036,9 +17036,8 @@ function validateMeca(session, file, opts) {
|
|
|
17036
17036
|
if (!entry)
|
|
17037
17037
|
return false;
|
|
17038
17038
|
const data = entry.getData().toString();
|
|
17039
|
-
console.log(data);
|
|
17040
17039
|
try {
|
|
17041
|
-
const transfer = new TransferXml(data);
|
|
17040
|
+
const transfer = new TransferXml(data, { log: session.log });
|
|
17042
17041
|
const valid = yield transfer.validateXml();
|
|
17043
17042
|
if (!valid)
|
|
17044
17043
|
session.log.error(`${TRANSFER} DTD validation failed`);
|
package/dist/transfer.d.ts
CHANGED
|
@@ -42,8 +42,8 @@ export type ProcessingInstructions = {
|
|
|
42
42
|
comments?: string[];
|
|
43
43
|
};
|
|
44
44
|
export type Transfer = {
|
|
45
|
-
source?: Location
|
|
46
|
-
destination?: Location
|
|
45
|
+
source?: Location & Required<Pick<Location, 'provider'>>;
|
|
46
|
+
destination?: Location & Required<Pick<Location, 'provider' | 'publication'>>;
|
|
47
47
|
instructions?: ProcessingInstructions;
|
|
48
48
|
};
|
|
49
49
|
export declare class TransferXml {
|
package/dist/transfer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transfer.d.ts","sourceRoot":"","sources":["../src/transfer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAe,aAAa,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,KAAK,EAAE,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"transfer.d.ts","sourceRoot":"","sources":["../src/transfer.ts"],"names":[],"mappings":"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"}
|
package/dist/transfer.js
CHANGED
|
@@ -10,7 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
import fs from 'node:fs';
|
|
11
11
|
import path from 'node:path';
|
|
12
12
|
import { js2xml, xml2js } from 'xml-js';
|
|
13
|
-
import { convertToUnist
|
|
13
|
+
import { convertToUnist } from 'jats-utils';
|
|
14
|
+
import { xmllintValidate } from 'jats-xml';
|
|
14
15
|
import { tic } from 'myst-cli-utils';
|
|
15
16
|
import fetch from 'node-fetch';
|
|
16
17
|
import { createTempFolder, elementWithText, removeTempFolder, select, selectAll } from './utils.js';
|
package/dist/validate.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAwBtD;;;;;;;;;;;GAWG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAwBtD;;;;;;;;;;;GAWG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,oBAoH7F;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,iBAQ3B"}
|
package/dist/validate.js
CHANGED
|
@@ -75,9 +75,8 @@ export function validateMeca(session, file, opts) {
|
|
|
75
75
|
if (!entry)
|
|
76
76
|
return false;
|
|
77
77
|
const data = entry.getData().toString();
|
|
78
|
-
console.log(data);
|
|
79
78
|
try {
|
|
80
|
-
const transfer = new TransferXml(data);
|
|
79
|
+
const transfer = new TransferXml(data, { log: session.log });
|
|
81
80
|
const valid = yield transfer.validateXml();
|
|
82
81
|
if (!valid)
|
|
83
82
|
session.log.error(`${TRANSFER} DTD validation failed`);
|
package/dist/version.d.ts
CHANGED
package/dist/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
const version = '1.0.
|
|
1
|
+
const version = '1.0.8';
|
|
2
2
|
export default version;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "meca",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.8",
|
|
4
4
|
"description": "Types and utilities for working with MECA",
|
|
5
5
|
"author": "Rowan Cockett <rowan@curvenote.com>",
|
|
6
6
|
"homepage": "https://github.com/curvenote/jats",
|
|
@@ -45,8 +45,10 @@
|
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"adm-zip": "^0.5.10",
|
|
48
|
-
"jats-
|
|
48
|
+
"jats-utils": "^1.0.8",
|
|
49
|
+
"jats-xml": "^1.0.8",
|
|
49
50
|
"node-fetch": "^3.3.1",
|
|
51
|
+
"unist-util-select": "^4.0.0",
|
|
50
52
|
"xml-js": "^1.6.11"
|
|
51
53
|
},
|
|
52
54
|
"peerDependencies": {
|