@flywheel-io/fw-file-rs 0.8.0 → 0.9.0

package/dcm/dcm.d.ts

@@ -32,12 +32,33 @@ export class DeidProfile {
     private constructor();
     free(): void;
     [Symbol.dispose](): void;
+    /**
+     * @deprecated Use `deid_file(filename, bytes)`, which picks the profile
+     * section by file type. Unlike this method it throws for a profile with
+     * no `dicom` section instead of returning the input unchanged.
+     */
     deid_dcm(dcm_bytes: Uint8Array): Uint8Array;
     /**
      * Apply the profile and return `[bytes, report]` — see
      * [`deid_result_to_js_array`] for the shape.
+     *
+     * @deprecated Use `deid_file_with_report(filename, bytes)`, which picks
+     * the profile section by file type. Unlike this method it throws for a
+     * profile with no `dicom` section instead of returning the input
+     * unchanged.
      */
     deid_dcm_with_report(dcm_bytes: Uint8Array): Array<any>;
+    /**
+     * De-identify a file of any supported type, detected from its content
+     * and then `filename`. Throws for an unrecognized type or one the
+     * profile has no section for.
+     */
+    deid_file(filename: string, bytes: Uint8Array): Uint8Array;
+    /**
+     * `deid_file`, returning `[bytes, report, section]` where `section`
+     * names the profile section applied (`"dicom"`, `"json"`).
+     */
+    deid_file_with_report(filename: string, bytes: Uint8Array): Array<any>;
     static from_yaml(yaml: string): DeidProfile;
     static schema(): any;
 }
@@ -95,6 +116,8 @@ export interface InitOutput {
     readonly create_dcm_as_bytes: (a: any) => [number, number, number, number];
     readonly deidprofile_deid_dcm: (a: number, b: number, c: number) => [number, number, number, number];
     readonly deidprofile_deid_dcm_with_report: (a: number, b: number, c: number) => [number, number, number];
+    readonly deidprofile_deid_file: (a: number, b: number, c: number, d: number, e: number) => [number, number, number, number];
+    readonly deidprofile_deid_file_with_report: (a: number, b: number, c: number, d: number, e: number) => [number, number, number];
     readonly deidprofile_from_yaml: (a: number, b: number) => [number, number, number];
     readonly deidprofile_schema: () => [number, number, number];
     readonly get_fw_meta: (a: any, b: any) => [number, number, number];
@@ -103,8 +126,8 @@ export interface InitOutput {
     readonly parse_header: (a: number, b: number, c: number, d: number) => [number, number, number];
     readonly parse_header_full: (a: number, b: number) => [number, number, number];
     readonly read_until_pixels: (a: any, b: any, c: number) => any;
-    readonly wasm_bindgen_46acc7fd244e2d4a___convert__closures_____invoke___js_sys_e24e7246c4058216___Function_fn_wasm_bindgen_46acc7fd244e2d4a___JsValue_____wasm_bindgen_46acc7fd244e2d4a___sys__Undefined___js_sys_e24e7246c4058216___Function_fn_wasm_bindgen_46acc7fd244e2d4a___JsValue_____wasm_bindgen_46acc7fd244e2d4a___sys__Undefined_______true_: (a: number, b: number, c: any, d: any) => void;
-    readonly wasm_bindgen_46acc7fd244e2d4a___convert__closures_____invoke___wasm_bindgen_46acc7fd244e2d4a___JsValue__core_ed718c3d60ebd546___result__Result_____wasm_bindgen_46acc7fd244e2d4a___JsError___true_: (a: number, b: number, c: any) => [number, number];
+    readonly wasm_bindgen_100bdf2efd44f6b0___convert__closures_____invoke___js_sys_2beb89f55c1fda4c___Function_fn_wasm_bindgen_100bdf2efd44f6b0___JsValue_____wasm_bindgen_100bdf2efd44f6b0___sys__Undefined___js_sys_2beb89f55c1fda4c___Function_fn_wasm_bindgen_100bdf2efd44f6b0___JsValue_____wasm_bindgen_100bdf2efd44f6b0___sys__Undefined_______true_: (a: number, b: number, c: any, d: any) => void;
+    readonly wasm_bindgen_100bdf2efd44f6b0___convert__closures_____invoke___wasm_bindgen_100bdf2efd44f6b0___JsValue__core_608f92abc48d28da___result__Result_____wasm_bindgen_100bdf2efd44f6b0___JsError___true_: (a: number, b: number, c: any) => [number, number];
     readonly __wbindgen_malloc: (a: number, b: number) => number;
     readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
     readonly __wbindgen_exn_store: (a: number) => void;

package/dcm/dcm.js

@@ -235,6 +235,9 @@ export class DeidProfile {
         wasm.__wbg_deidprofile_free(ptr, 0);
     }
     /**
+     * @deprecated Use `deid_file(filename, bytes)`, which picks the profile
+     * section by file type. Unlike this method it throws for a profile with
+     * no `dicom` section instead of returning the input unchanged.
      * @param {Uint8Array} dcm_bytes
      * @returns {Uint8Array}
      */
@@ -252,6 +255,11 @@ export class DeidProfile {
     /**
      * Apply the profile and return `[bytes, report]` — see
      * [`deid_result_to_js_array`] for the shape.
+     *
+     * @deprecated Use `deid_file_with_report(filename, bytes)`, which picks
+     * the profile section by file type. Unlike this method it throws for a
+     * profile with no `dicom` section instead of returning the input
+     * unchanged.
      * @param {Uint8Array} dcm_bytes
      * @returns {Array<any>}
      */
@@ -264,6 +272,45 @@ export class DeidProfile {
         }
         return takeFromExternrefTable0(ret[0]);
     }
+    /**
+     * De-identify a file of any supported type, detected from its content
+     * and then `filename`. Throws for an unrecognized type or one the
+     * profile has no section for.
+     * @param {string} filename
+     * @param {Uint8Array} bytes
+     * @returns {Uint8Array}
+     */
+    deid_file(filename, bytes) {
+        const ptr0 = passStringToWasm0(filename, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passArray8ToWasm0(bytes, wasm.__wbindgen_malloc);
+        const len1 = WASM_VECTOR_LEN;
+        const ret = wasm.deidprofile_deid_file(this.__wbg_ptr, ptr0, len0, ptr1, len1);
+        if (ret[3]) {
+            throw takeFromExternrefTable0(ret[2]);
+        }
+        var v3 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
+        wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
+        return v3;
+    }
+    /**
+     * `deid_file`, returning `[bytes, report, section]` where `section`
+     * names the profile section applied (`"dicom"`, `"json"`).
+     * @param {string} filename
+     * @param {Uint8Array} bytes
+     * @returns {Array<any>}
+     */
+    deid_file_with_report(filename, bytes) {
+        const ptr0 = passStringToWasm0(filename, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ptr1 = passArray8ToWasm0(bytes, wasm.__wbindgen_malloc);
+        const len1 = WASM_VECTOR_LEN;
+        const ret = wasm.deidprofile_deid_file_with_report(this.__wbg_ptr, ptr0, len0, ptr1, len1);
+        if (ret[2]) {
+            throw takeFromExternrefTable0(ret[1]);
+        }
+        return takeFromExternrefTable0(ret[0]);
+    }
     /**
      * @param {string} yaml
      * @returns {DeidProfile}
@@ -402,10 +449,6 @@ function __wbg_get_imports() {
             const ret = Error(getStringFromWasm0(arg0, arg1));
             return ret;
         },
-        __wbg_Number_14af1003b8dd5ead: function(arg0) {
-            const ret = Number(arg0);
-            return ret;
-        },
         __wbg_String_8564e559799eccda: function(arg0, arg1) {
             const ret = String(arg1);
             const ptr1 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -616,7 +659,7 @@ function __wbg_get_imports() {
                     const a = state0.a;
                     state0.a = 0;
                     try {
-                        return wasm_bindgen_46acc7fd244e2d4a___convert__closures_____invoke___js_sys_e24e7246c4058216___Function_fn_wasm_bindgen_46acc7fd244e2d4a___JsValue_____wasm_bindgen_46acc7fd244e2d4a___sys__Undefined___js_sys_e24e7246c4058216___Function_fn_wasm_bindgen_46acc7fd244e2d4a___JsValue_____wasm_bindgen_46acc7fd244e2d4a___sys__Undefined_______true_(a, state0.b, arg0, arg1);
+                        return wasm_bindgen_100bdf2efd44f6b0___convert__closures_____invoke___js_sys_2beb89f55c1fda4c___Function_fn_wasm_bindgen_100bdf2efd44f6b0___JsValue_____wasm_bindgen_100bdf2efd44f6b0___sys__Undefined___js_sys_2beb89f55c1fda4c___Function_fn_wasm_bindgen_100bdf2efd44f6b0___JsValue_____wasm_bindgen_100bdf2efd44f6b0___sys__Undefined_______true_(a, state0.b, arg0, arg1);
                     } finally {
                         state0.a = a;
                     }
@@ -700,8 +743,8 @@ function __wbg_get_imports() {
             return ret;
         },
         __wbindgen_generic_0000000000000001: function(arg0, arg1) {
-            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 1346, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
-            const ret = makeMutClosure(arg0, arg1, wasm_bindgen_46acc7fd244e2d4a___convert__closures_____invoke___wasm_bindgen_46acc7fd244e2d4a___JsValue__core_ed718c3d60ebd546___result__Result_____wasm_bindgen_46acc7fd244e2d4a___JsError___true_);
+            // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [Externref], shim_idx: 1345, ret: Result(Unit), inner_ret: Some(Result(Unit)) }, mutable: true }) -> Externref`.
+            const ret = makeMutClosure(arg0, arg1, wasm_bindgen_100bdf2efd44f6b0___convert__closures_____invoke___wasm_bindgen_100bdf2efd44f6b0___JsValue__core_608f92abc48d28da___result__Result_____wasm_bindgen_100bdf2efd44f6b0___JsError___true_);
             return ret;
         },
         __wbindgen_generic_0000000000000002: function(arg0) {
@@ -740,15 +783,15 @@ function __wbg_get_imports() {
     };
 }
 
-function wasm_bindgen_46acc7fd244e2d4a___convert__closures_____invoke___wasm_bindgen_46acc7fd244e2d4a___JsValue__core_ed718c3d60ebd546___result__Result_____wasm_bindgen_46acc7fd244e2d4a___JsError___true_(arg0, arg1, arg2) {
-    const ret = wasm.wasm_bindgen_46acc7fd244e2d4a___convert__closures_____invoke___wasm_bindgen_46acc7fd244e2d4a___JsValue__core_ed718c3d60ebd546___result__Result_____wasm_bindgen_46acc7fd244e2d4a___JsError___true_(arg0, arg1, arg2);
+function wasm_bindgen_100bdf2efd44f6b0___convert__closures_____invoke___wasm_bindgen_100bdf2efd44f6b0___JsValue__core_608f92abc48d28da___result__Result_____wasm_bindgen_100bdf2efd44f6b0___JsError___true_(arg0, arg1, arg2) {
+    const ret = wasm.wasm_bindgen_100bdf2efd44f6b0___convert__closures_____invoke___wasm_bindgen_100bdf2efd44f6b0___JsValue__core_608f92abc48d28da___result__Result_____wasm_bindgen_100bdf2efd44f6b0___JsError___true_(arg0, arg1, arg2);
     if (ret[1]) {
         throw takeFromExternrefTable0(ret[0]);
     }
 }
 
-function wasm_bindgen_46acc7fd244e2d4a___convert__closures_____invoke___js_sys_e24e7246c4058216___Function_fn_wasm_bindgen_46acc7fd244e2d4a___JsValue_____wasm_bindgen_46acc7fd244e2d4a___sys__Undefined___js_sys_e24e7246c4058216___Function_fn_wasm_bindgen_46acc7fd244e2d4a___JsValue_____wasm_bindgen_46acc7fd244e2d4a___sys__Undefined_______true_(arg0, arg1, arg2, arg3) {
-    wasm.wasm_bindgen_46acc7fd244e2d4a___convert__closures_____invoke___js_sys_e24e7246c4058216___Function_fn_wasm_bindgen_46acc7fd244e2d4a___JsValue_____wasm_bindgen_46acc7fd244e2d4a___sys__Undefined___js_sys_e24e7246c4058216___Function_fn_wasm_bindgen_46acc7fd244e2d4a___JsValue_____wasm_bindgen_46acc7fd244e2d4a___sys__Undefined_______true_(arg0, arg1, arg2, arg3);
+function wasm_bindgen_100bdf2efd44f6b0___convert__closures_____invoke___js_sys_2beb89f55c1fda4c___Function_fn_wasm_bindgen_100bdf2efd44f6b0___JsValue_____wasm_bindgen_100bdf2efd44f6b0___sys__Undefined___js_sys_2beb89f55c1fda4c___Function_fn_wasm_bindgen_100bdf2efd44f6b0___JsValue_____wasm_bindgen_100bdf2efd44f6b0___sys__Undefined_______true_(arg0, arg1, arg2, arg3) {
+    wasm.wasm_bindgen_100bdf2efd44f6b0___convert__closures_____invoke___js_sys_2beb89f55c1fda4c___Function_fn_wasm_bindgen_100bdf2efd44f6b0___JsValue_____wasm_bindgen_100bdf2efd44f6b0___sys__Undefined___js_sys_2beb89f55c1fda4c___Function_fn_wasm_bindgen_100bdf2efd44f6b0___JsValue_____wasm_bindgen_100bdf2efd44f6b0___sys__Undefined_______true_(arg0, arg1, arg2, arg3);
 }
 
 const ContextFinalization = (typeof FinalizationRegistry === 'undefined')

package/dcm/dcm_bg.wasm.d.ts

@@ -25,6 +25,8 @@ export const context_stop_at_tags: (a: number, b: any) => [number, number, numbe
 export const create_dcm_as_bytes: (a: any) => [number, number, number, number];
 export const deidprofile_deid_dcm: (a: number, b: number, c: number) => [number, number, number, number];
 export const deidprofile_deid_dcm_with_report: (a: number, b: number, c: number) => [number, number, number];
+export const deidprofile_deid_file: (a: number, b: number, c: number, d: number, e: number) => [number, number, number, number];
+export const deidprofile_deid_file_with_report: (a: number, b: number, c: number, d: number, e: number) => [number, number, number];
 export const deidprofile_from_yaml: (a: number, b: number) => [number, number, number];
 export const deidprofile_schema: () => [number, number, number];
 export const get_fw_meta: (a: any, b: any) => [number, number, number];
@@ -33,8 +35,8 @@ export const is_dicom_part10: (a: any) => any;
 export const parse_header: (a: number, b: number, c: number, d: number) => [number, number, number];
 export const parse_header_full: (a: number, b: number) => [number, number, number];
 export const read_until_pixels: (a: any, b: any, c: number) => any;
-export const wasm_bindgen_46acc7fd244e2d4a___convert__closures_____invoke___js_sys_e24e7246c4058216___Function_fn_wasm_bindgen_46acc7fd244e2d4a___JsValue_____wasm_bindgen_46acc7fd244e2d4a___sys__Undefined___js_sys_e24e7246c4058216___Function_fn_wasm_bindgen_46acc7fd244e2d4a___JsValue_____wasm_bindgen_46acc7fd244e2d4a___sys__Undefined_______true_: (a: number, b: number, c: any, d: any) => void;
-export const wasm_bindgen_46acc7fd244e2d4a___convert__closures_____invoke___wasm_bindgen_46acc7fd244e2d4a___JsValue__core_ed718c3d60ebd546___result__Result_____wasm_bindgen_46acc7fd244e2d4a___JsError___true_: (a: number, b: number, c: any) => [number, number];
+export const wasm_bindgen_100bdf2efd44f6b0___convert__closures_____invoke___js_sys_2beb89f55c1fda4c___Function_fn_wasm_bindgen_100bdf2efd44f6b0___JsValue_____wasm_bindgen_100bdf2efd44f6b0___sys__Undefined___js_sys_2beb89f55c1fda4c___Function_fn_wasm_bindgen_100bdf2efd44f6b0___JsValue_____wasm_bindgen_100bdf2efd44f6b0___sys__Undefined_______true_: (a: number, b: number, c: any, d: any) => void;
+export const wasm_bindgen_100bdf2efd44f6b0___convert__closures_____invoke___wasm_bindgen_100bdf2efd44f6b0___JsValue__core_608f92abc48d28da___result__Result_____wasm_bindgen_100bdf2efd44f6b0___JsError___true_: (a: number, b: number, c: any) => [number, number];
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_exn_store: (a: number) => void;

package/package.json

@@ -5,7 +5,7 @@
     "Flywheel <support@flywheel.io>"
   ],
   "description": "JavaScript/WebAssembly bindings for fw-file rust crate",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "license": "MIT",
   "repository": {
     "type": "git",