abstract-image 11.0.17 → 11.0.19
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/lib/index.d.ts +1 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/lib/model/stringify-parse.js +15 -2
- package/lib/model/stringify-parse.js.map +1 -1
- package/lib/stringify-parse.d.ts +4 -0
- package/lib/stringify-parse.d.ts.map +1 -0
- package/lib/stringify-parse.js +83 -0
- package/lib/stringify-parse.js.map +1 -0
- package/package.json +2 -2
- package/src/index.ts +1 -0
- package/src/{model/stringify-parse.ts → stringify-parse.ts} +19 -4
package/lib/index.d.ts
CHANGED
|
@@ -10,4 +10,5 @@ export * from "./exporters/dxf2d-export-image.js";
|
|
|
10
10
|
export * from "./exporters/react-svg-export-image.js";
|
|
11
11
|
export * from "./exporters/eps-export-image.js";
|
|
12
12
|
export * from "./abstract-image-xml/index.js";
|
|
13
|
+
export * from "./stringify-parse.js";
|
|
13
14
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,iCAAiC,CAAC;AAChD,cAAc,+BAA+B,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC;AAClD,cAAc,uCAAuC,CAAC;AACtD,cAAc,iCAAiC,CAAC;AAChD,cAAc,+BAA+B,CAAA;AAC7C,cAAc,sBAAsB,CAAA"}
|
package/lib/index.js
CHANGED
|
@@ -26,5 +26,6 @@ __exportStar(require("./exporters/dxf2d-export-image.js"), exports);
|
|
|
26
26
|
__exportStar(require("./exporters/react-svg-export-image.js"), exports);
|
|
27
27
|
__exportStar(require("./exporters/eps-export-image.js"), exports);
|
|
28
28
|
__exportStar(require("./abstract-image-xml/index.js"), exports);
|
|
29
|
+
__exportStar(require("./stringify-parse.js"), exports);
|
|
29
30
|
// dummy
|
|
30
31
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4DAA0C;AAC1C,mDAAiC;AACjC,uDAAqC;AACrC,mDAAiC;AACjC,kDAAgC;AAChC,wDAAsC;AACtC,kEAAgD;AAChD,kEAAgD;AAChD,oEAAkD;AAClD,wEAAsD;AACtD,kEAAgD;AAChD,gEAA6C;AAC7C,QAAQ"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4DAA0C;AAC1C,mDAAiC;AACjC,uDAAqC;AACrC,mDAAiC;AACjC,kDAAgC;AAChC,wDAAsC;AACtC,kEAAgD;AAChD,kEAAgD;AAChD,oEAAkD;AAClD,wEAAsD;AACtD,kEAAgD;AAChD,gEAA6C;AAC7C,uDAAoC;AACpC,QAAQ"}
|
|
@@ -29,8 +29,21 @@ function componentToJsonSafe(c) {
|
|
|
29
29
|
}
|
|
30
30
|
function componentFromJsonSafe(c) {
|
|
31
31
|
if (c?.type === "binaryimage") {
|
|
32
|
-
if (c.data?.type === "bytes"
|
|
33
|
-
|
|
32
|
+
if (c.data?.type === "bytes") {
|
|
33
|
+
if (typeof c.data.bytes === "string") {
|
|
34
|
+
return { ...c, data: { type: "bytes", bytes: fromBase64(c.data.bytes) } };
|
|
35
|
+
}
|
|
36
|
+
// legacy fallback, will remove
|
|
37
|
+
if (c.data.bytes?.data) {
|
|
38
|
+
return {
|
|
39
|
+
...c,
|
|
40
|
+
data: { ...c.data, bytes: new Uint8Array(c.data.bytes.data) },
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
if (!Array.isArray(c.data?.bytes)) {
|
|
44
|
+
return { ...c, data: { ...c.data, bytes: new Uint8Array(Object.values(c.data.bytes)) } }; // Somtimes Uint8Array is an object instead of an array
|
|
45
|
+
}
|
|
46
|
+
return { ...c, data: { ...c.data, bytes: new Uint8Array(c.data.bytes) } };
|
|
34
47
|
}
|
|
35
48
|
return c;
|
|
36
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stringify-parse.js","sourceRoot":"","sources":["../../src/model/stringify-parse.ts"],"names":[],"mappings":";;AAGA,8BAGC;AAED,sBAGC;AARD,SAAgB,SAAS,CAAC,aAA4B;IACpD,MAAM,IAAI,GAAG,EAAE,GAAG,aAAa,EAAE,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;IACjG,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAC9B,CAAC;AAED,SAAgB,KAAK,CAAC,gBAAwB;IAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACzC,OAAO,EAAE,GAAG,GAAG,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAmB,CAAC;AACpG,CAAC;AAED,SAAS,mBAAmB,CAAC,CAAY;IACvC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;QACf,KAAK,aAAa,CAAC,CAAC,CAAC;YACnB,MAAM,EAAE,GAAG,CAAgB,CAAC;YAC5B,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC7B,OAAO,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;YAC5E,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,KAAK,OAAO;YACV,OAAO,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;QACjE,KAAK,UAAU;YACb,OAAO,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QACvD;YACE,OAAO,CAAC,CAAC;IACb,CAAC;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"stringify-parse.js","sourceRoot":"","sources":["../../src/model/stringify-parse.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stringify-parse.d.ts","sourceRoot":"","sources":["../src/stringify-parse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAGvD,wBAAgB,SAAS,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,CAG9D;AAED,wBAAgB,KAAK,CAAC,gBAAgB,EAAE,MAAM,GAAG,aAAa,CAG7D"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.stringify = stringify;
|
|
4
|
+
exports.parse = parse;
|
|
5
|
+
function stringify(abstractImage) {
|
|
6
|
+
const safe = { ...abstractImage, components: abstractImage.components.map(componentToJsonSafe) };
|
|
7
|
+
return JSON.stringify(safe);
|
|
8
|
+
}
|
|
9
|
+
function parse(stringifiedImage) {
|
|
10
|
+
const obj = JSON.parse(stringifiedImage);
|
|
11
|
+
return { ...obj, components: (obj.components ?? []).map(componentFromJsonSafe) };
|
|
12
|
+
}
|
|
13
|
+
function componentToJsonSafe(c) {
|
|
14
|
+
switch (c.type) {
|
|
15
|
+
case "binaryimage": {
|
|
16
|
+
const bi = c;
|
|
17
|
+
if (bi.data.type === "bytes") {
|
|
18
|
+
return { ...bi, data: { type: "bytes", bytes: toBase64(bi.data.bytes) } };
|
|
19
|
+
}
|
|
20
|
+
return bi;
|
|
21
|
+
}
|
|
22
|
+
case "group":
|
|
23
|
+
return { ...c, children: c.children.map(componentToJsonSafe) };
|
|
24
|
+
case "subimage":
|
|
25
|
+
return { ...c, image: componentToJsonSafe(c.image) };
|
|
26
|
+
default:
|
|
27
|
+
return c;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
function componentFromJsonSafe(c) {
|
|
31
|
+
if (c?.type === "binaryimage") {
|
|
32
|
+
if (c.data?.type === "bytes") {
|
|
33
|
+
if (typeof c.data.bytes === "string") {
|
|
34
|
+
return { ...c, data: { type: "bytes", bytes: fromBase64(c.data.bytes) } };
|
|
35
|
+
}
|
|
36
|
+
// legacy fallback, will remove
|
|
37
|
+
if (c.data.bytes?.data) {
|
|
38
|
+
return {
|
|
39
|
+
...c,
|
|
40
|
+
data: { ...c.data, bytes: new Uint8Array(c.data.bytes.data) },
|
|
41
|
+
};
|
|
42
|
+
}
|
|
43
|
+
if (!Array.isArray(c.data?.bytes)) {
|
|
44
|
+
return { ...c, data: { ...c.data, bytes: new Uint8Array(Object.values(c.data.bytes)) } }; // Somtimes Uint8Array is an object instead of an array
|
|
45
|
+
}
|
|
46
|
+
return { ...c, data: { ...c.data, bytes: new Uint8Array(c.data.bytes) } };
|
|
47
|
+
}
|
|
48
|
+
return c;
|
|
49
|
+
}
|
|
50
|
+
if (c?.type === "group") {
|
|
51
|
+
return { ...c, children: Array.isArray(c.children) ? c.children.map(componentFromJsonSafe) : [] };
|
|
52
|
+
}
|
|
53
|
+
if (c?.type === "subimage") {
|
|
54
|
+
return { ...c, image: componentFromJsonSafe(c.image) };
|
|
55
|
+
}
|
|
56
|
+
return c;
|
|
57
|
+
}
|
|
58
|
+
function toBase64(u8) {
|
|
59
|
+
// Node
|
|
60
|
+
if (typeof Buffer !== "undefined") {
|
|
61
|
+
return Buffer.from(u8).toString("base64");
|
|
62
|
+
}
|
|
63
|
+
// Browser
|
|
64
|
+
let bin = "";
|
|
65
|
+
for (const e of u8) {
|
|
66
|
+
bin += String.fromCharCode(e);
|
|
67
|
+
}
|
|
68
|
+
return btoa(bin);
|
|
69
|
+
}
|
|
70
|
+
function fromBase64(b64) {
|
|
71
|
+
// Node
|
|
72
|
+
if (typeof Buffer !== "undefined") {
|
|
73
|
+
return new Uint8Array(Buffer.from(b64, "base64"));
|
|
74
|
+
}
|
|
75
|
+
// Browser
|
|
76
|
+
const bin = atob(b64);
|
|
77
|
+
const out = new Uint8Array(bin.length);
|
|
78
|
+
for (let i = 0; i < bin.length; i++) {
|
|
79
|
+
out[i] = bin.charCodeAt(i);
|
|
80
|
+
}
|
|
81
|
+
return out;
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=stringify-parse.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stringify-parse.js","sourceRoot":"","sources":["../src/stringify-parse.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "abstract-image",
|
|
3
|
-
"version": "11.0.
|
|
3
|
+
"version": "11.0.19",
|
|
4
4
|
"description": "Dynamically create images using code or JSX and render to any format",
|
|
5
5
|
"repository": "https://github.com/dividab/abstract-visuals/tree/master/packages/abstract-image",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"vite": "^6.0.1",
|
|
34
34
|
"vitest": "^2.1.6"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "e10419e178b6aee97ac182018f66f1754bc71a00"
|
|
37
37
|
}
|
package/src/index.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { AbstractImage } from "./abstract-image";
|
|
2
|
-
import { BinaryImage, Component, Group, SubImage } from "./component";
|
|
1
|
+
import { AbstractImage } from "./model/abstract-image";
|
|
2
|
+
import { BinaryImage, Component, Group, SubImage } from "./model/component";
|
|
3
3
|
|
|
4
4
|
export function stringify(abstractImage: AbstractImage): string {
|
|
5
5
|
const safe = { ...abstractImage, components: abstractImage.components.map(componentToJsonSafe) };
|
|
@@ -29,10 +29,25 @@ function componentToJsonSafe(c: Component): any {
|
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
+
type BufferFromUint8ArrayStringified = { data: Uint8Array; type: "Buffer" };
|
|
33
|
+
|
|
32
34
|
function componentFromJsonSafe(c: any): Component {
|
|
33
35
|
if (c?.type === "binaryimage") {
|
|
34
|
-
if (c.data?.type === "bytes"
|
|
35
|
-
|
|
36
|
+
if (c.data?.type === "bytes") {
|
|
37
|
+
if (typeof c.data.bytes === "string") {
|
|
38
|
+
return { ...c, data: { type: "bytes", bytes: fromBase64(c.data.bytes) } } as BinaryImage;
|
|
39
|
+
}
|
|
40
|
+
// legacy fallback, will remove
|
|
41
|
+
if ((c.data.bytes as unknown as BufferFromUint8ArrayStringified)?.data) {
|
|
42
|
+
return {
|
|
43
|
+
...c,
|
|
44
|
+
data: { ...c.data, bytes: new Uint8Array((c.data.bytes as unknown as BufferFromUint8ArrayStringified).data) },
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
if (!Array.isArray(c.data?.bytes)) {
|
|
48
|
+
return { ...c, data: { ...c.data, bytes: new Uint8Array(Object.values(c.data.bytes)) } }; // Somtimes Uint8Array is an object instead of an array
|
|
49
|
+
}
|
|
50
|
+
return { ...c, data: { ...c.data, bytes: new Uint8Array(c.data.bytes) } };
|
|
36
51
|
}
|
|
37
52
|
return c as BinaryImage;
|
|
38
53
|
}
|