nmr-processing 13.0.0 → 13.0.2

package/nmr-processing.d.ts

@@ -61,12 +61,14 @@ export declare function apodization(data: DataReIm | DataXReIm, options?: Apodiz
     im: DoubleArray;
 };
 
-export declare interface Apodization2DOptions {
-    f1: ApodizationOptions;
-    f2: ApodizationOptions;
+export declare interface Apodization1DOptions {
+    apply?: boolean;
+    shapes?: Apodization2DOptions;
 }
 
-export declare function apodizationFilter(datum1D: Entry1DApodizationFilter, options: ApodizationOptions): {
+export declare type Apodization2DOptions = Shapes<FlexibleWindowFunctions>;
+
+export declare function apodizationFilter(datum1D: Entry1DApodizationFilter, options: Apodization1DOptions): {
     re: DoubleArray;
     im: DoubleArray;
 };
@@ -86,18 +88,6 @@ export declare interface ApodizationFilterOptions {
     windowData?: Float64Array;
 }
 
-export declare interface ApodizationOptions {
-    /**
-     * apply the window data to input data
-     * @default true
-     */
-    apply?: boolean;
-    /**
-     * parameters of the shape plus the kind of shape to identify
-     */
-    shapes?: Array<ShapeToAdd<FlexibleWindowFunctions>>;
-}
-
 /***
  * @param {object} Filters [{name:'',options:{}},{...}]
  */
@@ -466,7 +456,7 @@ export { FiltersManager }
  */
 export declare function findMultiplet(name: string): MultipletDefinition | undefined;
 
-export declare type FlexibleWindowFunctions = Exponential<Partial<ExponentialOptions>> | LorentToGauss<Partial<LorentzToGaussOptions>> | SineBell<Partial<SineBellOptions>> | SineSquare<Partial<SineBellOptions>> | Traf<Partial<TrafOptions>> | ModifiedGaussian<Partial<ModifiedGaussianOptions>>;
+export declare type FlexibleWindowFunctions = Exponential<Partial<ExponentialOptions>> | LorentToGauss<Partial<LorentzToGaussOptions>> | SineBell<Partial<SineBellOptions>> | SineSquare<Partial<SineSquareOptions>> | Traf<Partial<TrafOptions>> | ModifiedGaussian<Partial<ModifiedGaussianOptions>>;
 
 export declare interface ForwardLPOptions {
     /**
@@ -2657,7 +2647,7 @@ export declare function normalizeNucleus(nucleus: string): string;
 
 export { Nuclei }
 
-export declare type Nucleus = Nuclei | `${Nuclei},${Nuclei}` | (string & {});
+export declare type Nucleus = Nuclei | `${Nuclei},${Nuclei}` | (string & Record<never, never>);
 
 declare type Nucleus_2 = Nuclei | (string & Record<never, never>);
 
@@ -3408,9 +3398,11 @@ declare interface ShapeOptions<ShapeWindow = WindowFunctions> {
     /**
      * parameters of the shape plus the kind of shape to identify
      */
-    shapes?: Array<ShapeToAdd<ShapeWindow>>;
+    shapes?: Shapes<ShapeWindow>;
 }
 
+declare type Shapes<ShapeWindow = WindowFunctions> = Partial<Record<WindowFunctions['kind'], ShapeToAdd<ShapeWindow>>>;
+
 declare interface ShapeToAdd<ShapeWindows = WindowFunctions> {
     /**
      * if it is false the shape is not included in the apodization
@@ -3714,6 +3706,8 @@ declare interface SineSquare<ShapeOption = SineBellOptions> {
     options: ShapeOption;
 }
 
+declare type SineSquareOptions = Omit<SineBellOptions, 'exponent'>;
+
 export declare type Solvent = keyof typeof impuritiesContent;
 
 declare type Solvent_2 = keyof typeof impurities;