@pixzle/browser 0.1.7 → 0.1.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/{block.d.ts → image-buffer.d.ts} +12 -0
- package/dist/{block.js → image-buffer.js} +28 -10
- package/dist/image-buffer.js.map +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.js +4 -30
- package/dist/index.js.map +1 -1
- package/dist/restorer.d.ts +4 -5
- package/dist/restorer.js +57 -37
- package/dist/restorer.js.map +1 -1
- package/package.json +5 -3
- package/dist/block.js.map +0 -1
|
@@ -2,6 +2,18 @@
|
|
|
2
2
|
* Split an image (HTMLImageElement or ImageBitmap) into blocks
|
|
3
3
|
*/
|
|
4
4
|
export declare function splitImageToBlocks(image: HTMLImageElement | ImageBitmap, blockSize: number): Uint8Array[];
|
|
5
|
+
/**
|
|
6
|
+
* Extract a raw RGBA buffer from an image
|
|
7
|
+
*/
|
|
8
|
+
export declare function imageToImageBuffer(image: HTMLImageElement | ImageBitmap): {
|
|
9
|
+
buffer: Uint8Array;
|
|
10
|
+
width: number;
|
|
11
|
+
height: number;
|
|
12
|
+
};
|
|
13
|
+
/**
|
|
14
|
+
* Create an ImageBitmap from a raw RGBA buffer
|
|
15
|
+
*/
|
|
16
|
+
export declare function imageBufferToImageBitmap(buffer: Uint8Array, width: number, height: number): Promise<ImageBitmap>;
|
|
5
17
|
/**
|
|
6
18
|
* Create an ImageBitmap from blocks
|
|
7
19
|
*/
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.splitImageToBlocks = splitImageToBlocks;
|
|
4
|
+
exports.imageToImageBuffer = imageToImageBuffer;
|
|
5
|
+
exports.imageBufferToImageBitmap = imageBufferToImageBitmap;
|
|
4
6
|
exports.blocksToImageBitmap = blocksToImageBitmap;
|
|
5
7
|
exports.blocksPerImage = blocksPerImage;
|
|
6
8
|
const core_1 = require("@pixzle/core");
|
|
7
|
-
|
|
8
|
-
* Split an image (HTMLImageElement or ImageBitmap) into blocks
|
|
9
|
-
*/
|
|
10
|
-
function splitImageToBlocks(image, blockSize) {
|
|
9
|
+
function drawImageToBuffer(image) {
|
|
11
10
|
const width = image instanceof HTMLImageElement ? image.naturalWidth : image.width;
|
|
12
11
|
const height = image instanceof HTMLImageElement ? image.naturalHeight : image.height;
|
|
13
12
|
const canvas = document.createElement("canvas");
|
|
@@ -18,13 +17,32 @@ function splitImageToBlocks(image, blockSize) {
|
|
|
18
17
|
throw new Error("Could not get 2D context");
|
|
19
18
|
ctx.drawImage(image, 0, 0);
|
|
20
19
|
const imageData = ctx.getImageData(0, 0, width, height);
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
return {
|
|
21
|
+
buffer: new Uint8Array(imageData.data.buffer, imageData.data.byteOffset, imageData.data.byteLength),
|
|
22
|
+
width,
|
|
23
|
+
height,
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Split an image (HTMLImageElement or ImageBitmap) into blocks
|
|
28
|
+
*/
|
|
29
|
+
function splitImageToBlocks(image, blockSize) {
|
|
30
|
+
const { buffer, width, height } = drawImageToBuffer(image);
|
|
26
31
|
return (0, core_1.splitImageToBlocks)(buffer, width, height, blockSize);
|
|
27
32
|
}
|
|
33
|
+
/**
|
|
34
|
+
* Extract a raw RGBA buffer from an image
|
|
35
|
+
*/
|
|
36
|
+
function imageToImageBuffer(image) {
|
|
37
|
+
return drawImageToBuffer(image);
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Create an ImageBitmap from a raw RGBA buffer
|
|
41
|
+
*/
|
|
42
|
+
async function imageBufferToImageBitmap(buffer, width, height) {
|
|
43
|
+
const imageData = new ImageData(new Uint8ClampedArray(buffer.buffer, buffer.byteOffset, buffer.byteLength), width, height);
|
|
44
|
+
return createImageBitmap(imageData);
|
|
45
|
+
}
|
|
28
46
|
/**
|
|
29
47
|
* Create an ImageBitmap from blocks
|
|
30
48
|
*/
|
|
@@ -63,4 +81,4 @@ function blocksPerImage(allBlocks, fragmentBlocksCount, seed, processFunc) {
|
|
|
63
81
|
}
|
|
64
82
|
return processedBlocks.slice(0, globalOffset);
|
|
65
83
|
}
|
|
66
|
-
//# sourceMappingURL=
|
|
84
|
+
//# sourceMappingURL=image-buffer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"image-buffer.js","sourceRoot":"","sources":["../src/image-buffer.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type ImageInfo, type ManifestData } from "@pixzle/core";
|
|
2
2
|
import { ImageRestorer, type ImageSource } from "./restorer";
|
|
3
3
|
export { ImageRestorer, type ImageSource };
|
|
4
4
|
export interface BrowserRestoreOptions {
|
package/dist/index.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ImageRestorer = void 0;
|
|
4
4
|
exports.fetchJson = fetchJson;
|
|
5
5
|
exports.fetchManifest = fetchManifest;
|
|
6
|
+
const core_1 = require("@pixzle/core");
|
|
6
7
|
const restorer_1 = require("./restorer");
|
|
7
8
|
Object.defineProperty(exports, "ImageRestorer", { enumerable: true, get: function () { return restorer_1.ImageRestorer; } });
|
|
8
9
|
/**
|
|
@@ -27,13 +28,6 @@ async function fetchJson(url, fetchOptions) {
|
|
|
27
28
|
async function fetchManifest(url, fetchOptions) {
|
|
28
29
|
return fetchJson(url, fetchOptions);
|
|
29
30
|
}
|
|
30
|
-
function validateFragmentImageCount(fragmentImages, manifest) {
|
|
31
|
-
const manifestImageCount = manifest.images.length;
|
|
32
|
-
const fragmentImageCount = fragmentImages.length;
|
|
33
|
-
if (manifestImageCount !== fragmentImageCount) {
|
|
34
|
-
throw new Error(`Fragment image count mismatch: expected ${manifestImageCount} but got ${fragmentImageCount}`);
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
31
|
async function restore(options) {
|
|
38
32
|
const { images, manifest: manifestSource, manifestData, fetchOptions, } = validateRestoreOptions(options);
|
|
39
33
|
let manifest;
|
|
@@ -46,7 +40,6 @@ async function restore(options) {
|
|
|
46
40
|
else {
|
|
47
41
|
throw new Error("Manifest not provided");
|
|
48
42
|
}
|
|
49
|
-
validateFragmentImageCount(images, manifest);
|
|
50
43
|
const restorer = new restorer_1.ImageRestorer();
|
|
51
44
|
return await restorer.restoreImages(images, manifest, fetchOptions);
|
|
52
45
|
}
|
|
@@ -61,31 +54,12 @@ const pixzle = {
|
|
|
61
54
|
};
|
|
62
55
|
exports.default = pixzle;
|
|
63
56
|
function validateRestoreOptions(options) {
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
const { images, manifest, manifestData } = options;
|
|
67
|
-
if (!images || !Array.isArray(images) || images.length === 0)
|
|
68
|
-
throw new Error("[restore] images must be a non-empty array.");
|
|
69
|
-
if (!manifest && !manifestData)
|
|
70
|
-
throw new Error("[restore] Either manifest or manifestData is required.");
|
|
71
|
-
if (manifest && typeof manifest !== "string")
|
|
72
|
-
throw new Error("[restore] manifest must be a string.");
|
|
57
|
+
(0, core_1.validateOptionsWithImages)(options, "restore");
|
|
58
|
+
(0, core_1.validateManifestOptions)(options, "restore");
|
|
73
59
|
return options;
|
|
74
60
|
}
|
|
75
61
|
function validateRestoreImageOptions(options) {
|
|
76
|
-
|
|
77
|
-
throw new Error("[restoreImage] Options object is required.");
|
|
78
|
-
const { image, blockSize, seed, imageInfo } = options;
|
|
79
|
-
if (!image)
|
|
80
|
-
throw new Error("[restoreImage] image is required.");
|
|
81
|
-
if (typeof blockSize !== "number" || blockSize <= 0)
|
|
82
|
-
throw new Error("[restoreImage] blockSize must be a positive number.");
|
|
83
|
-
if (typeof seed !== "number")
|
|
84
|
-
throw new Error("[restoreImage] seed must be a number.");
|
|
85
|
-
if (!imageInfo ||
|
|
86
|
-
typeof imageInfo.w !== "number" ||
|
|
87
|
-
typeof imageInfo.h !== "number")
|
|
88
|
-
throw new Error("[restoreImage] imageInfo with valid w and h is required.");
|
|
62
|
+
(0, core_1.validateRestoreImageOptions)(options, "restoreImage");
|
|
89
63
|
return options;
|
|
90
64
|
}
|
|
91
65
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAyCA,8BAWC;AAQD,sCAKC;AAjED,uCAMsB;AACtB,yCAA6D;AAEpD,8FAFA,wBAAa,OAEA;AA0BtB;;;;;GAKG;AACI,KAAK,UAAU,SAAS,CAC7B,GAAW,EACX,YAA0B;IAE1B,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAChD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CACb,oBAAoB,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,EAAE,CAC7D,CAAC;IACJ,CAAC;IACD,OAAO,QAAQ,CAAC,IAAI,EAAgB,CAAC;AACvC,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,aAAa,CACjC,GAAW,EACX,YAA0B;IAE1B,OAAO,SAAS,CAAe,GAAG,EAAE,YAAY,CAAC,CAAC;AACpD,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,OAA8B;IACnD,MAAM,EACJ,MAAM,EACN,QAAQ,EAAE,cAAc,EACxB,YAAY,EACZ,YAAY,GACb,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAEpC,IAAI,QAAsB,CAAC;IAC3B,IAAI,YAAY,EAAE,CAAC;QACjB,QAAQ,GAAG,YAAY,CAAC;IAC1B,CAAC;SAAM,IAAI,cAAc,EAAE,CAAC;QAC1B,QAAQ,GAAG,MAAM,aAAa,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IAC/D,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,wBAAa,EAAE,CAAC;IACrC,OAAO,MAAM,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;AACtE,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,OAAmC;IAEnC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,GACvD,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAEvC,MAAM,QAAQ,GAAG,IAAI,wBAAa,EAAE,CAAC;IACrC,OAAO,MAAM,QAAQ,CAAC,YAAY,CAChC,KAAK,EACL,SAAS,EACT,IAAI,EACJ,SAAS,EACT,YAAY,CACb,CAAC;AACJ,CAAC;AAED,MAAM,MAAM,GAAG;IACb,OAAO;IACP,YAAY;CACb,CAAC;AAEF,kBAAe,MAAM,CAAC;AAEtB,SAAS,sBAAsB,CAAC,OAA8B;IAC5D,IAAA,gCAAyB,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAA,8BAAuB,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,2BAA2B,CAAC,OAAmC;IACtE,IAAA,kCAA+B,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IACzD,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
package/dist/restorer.d.ts
CHANGED
|
@@ -17,9 +17,8 @@ export declare class ImageRestorer {
|
|
|
17
17
|
* @returns Promise resolving to the restored ImageBitmap
|
|
18
18
|
*/
|
|
19
19
|
restoreImage(imageSource: ImageSource, blockSize: number, seed: number, imageInfo: ImageInfo, fetchOptions?: RequestInit): Promise<ImageBitmap>;
|
|
20
|
-
private
|
|
21
|
-
private
|
|
22
|
-
private
|
|
23
|
-
private
|
|
24
|
-
private _reconstructImages;
|
|
20
|
+
private restoreEachImage;
|
|
21
|
+
private loadImageSource;
|
|
22
|
+
private loadImageBufferFromSource;
|
|
23
|
+
private yieldToMainThread;
|
|
25
24
|
}
|
package/dist/restorer.js
CHANGED
|
@@ -2,8 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ImageRestorer = void 0;
|
|
4
4
|
const core_1 = require("@pixzle/core");
|
|
5
|
-
const
|
|
6
|
-
const block_1 = require("./block");
|
|
5
|
+
const image_buffer_1 = require("./image-buffer");
|
|
7
6
|
class ImageRestorer {
|
|
8
7
|
/**
|
|
9
8
|
* Restore multiple images from shuffled fragments
|
|
@@ -12,11 +11,23 @@ class ImageRestorer {
|
|
|
12
11
|
* @returns Promise resolving to an array of restored ImageBitmaps
|
|
13
12
|
*/
|
|
14
13
|
async restoreImages(fragments, manifest, fetchOptions) {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
14
|
+
(0, core_1.validateFragmentImageCount)(fragments, manifest);
|
|
15
|
+
if (!manifest.config.crossImageShuffle) {
|
|
16
|
+
return await this.restoreEachImage(fragments, manifest, fetchOptions);
|
|
17
|
+
}
|
|
18
|
+
const fragmentImages = await Promise.all(fragments.map(async (fragment) => {
|
|
19
|
+
return await this.loadImageBufferFromSource(fragment, fetchOptions);
|
|
20
|
+
}));
|
|
21
|
+
const restoredBuffers = (0, core_1.restoreImageBuffers)(fragmentImages, manifest);
|
|
22
|
+
fragmentImages.length = 0;
|
|
23
|
+
const restoredImages = [];
|
|
24
|
+
for (let index = 0; index < restoredBuffers.length; index++) {
|
|
25
|
+
const restoredBuffer = restoredBuffers[index];
|
|
26
|
+
restoredImages.push(await (0, image_buffer_1.imageBufferToImageBitmap)(restoredBuffer, manifest.images[index].w, manifest.images[index].h));
|
|
27
|
+
restoredBuffers[index] = new Uint8Array(0);
|
|
28
|
+
await this.yieldToMainThread();
|
|
29
|
+
}
|
|
30
|
+
return restoredImages;
|
|
20
31
|
}
|
|
21
32
|
/**
|
|
22
33
|
* Restore a single image from a shuffled source
|
|
@@ -31,7 +42,17 @@ class ImageRestorer {
|
|
|
31
42
|
const [restoredImage] = await this.restoreImages([imageSource], manifest, fetchOptions);
|
|
32
43
|
return restoredImage;
|
|
33
44
|
}
|
|
34
|
-
async
|
|
45
|
+
async restoreEachImage(fragments, manifest, fetchOptions) {
|
|
46
|
+
const restoredImages = [];
|
|
47
|
+
for (let index = 0; index < fragments.length; index++) {
|
|
48
|
+
const fragment = await this.loadImageBufferFromSource(fragments[index], fetchOptions);
|
|
49
|
+
const restoredBuffer = (0, core_1.restoreSingleImageBuffer)(fragment, manifest.config, manifest.images[index]);
|
|
50
|
+
restoredImages.push(await (0, image_buffer_1.imageBufferToImageBitmap)(restoredBuffer, manifest.images[index].w, manifest.images[index].h));
|
|
51
|
+
await this.yieldToMainThread();
|
|
52
|
+
}
|
|
53
|
+
return restoredImages;
|
|
54
|
+
}
|
|
55
|
+
async loadImageSource(sourceInput, fetchOptions) {
|
|
35
56
|
let source = sourceInput;
|
|
36
57
|
if (typeof URL !== "undefined" && source instanceof URL) {
|
|
37
58
|
source = source.toString();
|
|
@@ -41,8 +62,20 @@ class ImageRestorer {
|
|
|
41
62
|
if (source.complete)
|
|
42
63
|
return source;
|
|
43
64
|
await new Promise((resolve, reject) => {
|
|
44
|
-
|
|
45
|
-
|
|
65
|
+
const handleLoad = () => {
|
|
66
|
+
cleanup();
|
|
67
|
+
resolve();
|
|
68
|
+
};
|
|
69
|
+
const handleError = () => {
|
|
70
|
+
cleanup();
|
|
71
|
+
reject(new Error("Failed to load image"));
|
|
72
|
+
};
|
|
73
|
+
const cleanup = () => {
|
|
74
|
+
source.removeEventListener("load", handleLoad);
|
|
75
|
+
source.removeEventListener("error", handleError);
|
|
76
|
+
};
|
|
77
|
+
source.addEventListener("load", handleLoad, { once: true });
|
|
78
|
+
source.addEventListener("error", handleError, { once: true });
|
|
46
79
|
});
|
|
47
80
|
return source;
|
|
48
81
|
}
|
|
@@ -62,34 +95,21 @@ class ImageRestorer {
|
|
|
62
95
|
}
|
|
63
96
|
throw new Error("Unsupported image source");
|
|
64
97
|
}
|
|
65
|
-
async
|
|
66
|
-
const
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
return { blocks, blockCountsPerImage };
|
|
76
|
-
}
|
|
77
|
-
async _readBlocksFromFragment(fragment, manifest, expectedCount, fetchOptions) {
|
|
78
|
-
const image = await this._loadImage(fragment, fetchOptions);
|
|
79
|
-
const blocks = (0, block_1.splitImageToBlocks)(image, manifest.config.blockSize);
|
|
80
|
-
return (0, core_1.takeBlocks)(blocks, expectedCount);
|
|
81
|
-
}
|
|
82
|
-
async _readBlocks(fragments, manifest, blockCounts, fetchOptions) {
|
|
83
|
-
const blockGroups = await Promise.all(fragments.map((fragment, i) => this._readBlocksFromFragment(fragment, manifest, blockCounts[i], fetchOptions)));
|
|
84
|
-
return blockGroups.flat();
|
|
98
|
+
async loadImageBufferFromSource(sourceInput, fetchOptions) {
|
|
99
|
+
const image = await this.loadImageSource(sourceInput, fetchOptions);
|
|
100
|
+
const imageBuffer = (0, image_buffer_1.imageToImageBuffer)(image);
|
|
101
|
+
if (image instanceof ImageBitmap &&
|
|
102
|
+
(typeof sourceInput === "string" ||
|
|
103
|
+
(typeof URL !== "undefined" && sourceInput instanceof URL) ||
|
|
104
|
+
(typeof Blob !== "undefined" && sourceInput instanceof Blob))) {
|
|
105
|
+
image.close();
|
|
106
|
+
}
|
|
107
|
+
return imageBuffer;
|
|
85
108
|
}
|
|
86
|
-
async
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
const imageBlocks = blocks.slice(start, end);
|
|
91
|
-
return await (0, block_1.blocksToImageBitmap)(imageBlocks, imageInfo.w, imageInfo.h, manifest.config.blockSize);
|
|
92
|
-
}));
|
|
109
|
+
async yieldToMainThread() {
|
|
110
|
+
await new Promise((resolve) => {
|
|
111
|
+
setTimeout(resolve, 0);
|
|
112
|
+
});
|
|
93
113
|
}
|
|
94
114
|
}
|
|
95
115
|
exports.ImageRestorer = ImageRestorer;
|
package/dist/restorer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restorer.js","sourceRoot":"","sources":["../src/restorer.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"restorer.js","sourceRoot":"","sources":["../src/restorer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pixzle/browser",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.8",
|
|
4
4
|
"description": "Browser implementation of image fragmentation and restoration",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -31,12 +31,14 @@
|
|
|
31
31
|
"directory": "packages/browser"
|
|
32
32
|
},
|
|
33
33
|
"license": "MIT",
|
|
34
|
+
"engines": {
|
|
35
|
+
"node": ">=20"
|
|
36
|
+
},
|
|
34
37
|
"publishConfig": {
|
|
35
38
|
"access": "public"
|
|
36
39
|
},
|
|
37
40
|
"dependencies": {
|
|
38
|
-
"@
|
|
39
|
-
"@pixzle/core": "0.1.7"
|
|
41
|
+
"@pixzle/core": "0.1.8"
|
|
40
42
|
},
|
|
41
43
|
"devDependencies": {
|
|
42
44
|
"happy-dom": "^20.0.11",
|
package/dist/block.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"block.js","sourceRoot":"","sources":["../src/block.ts"],"names":[],"mappings":"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"}
|