From ec07cab365ea4617164f6a7cd8da29a2a90f6326 Mon Sep 17 00:00:00 2001
From: thecodrr <thecodrr@protonmail.com>
Date: Fri, 13 May 2022 17:37:46 +0500
Subject: [PATCH] feat(importer): update standardnotes types

---
 packages/importer/package.json                |  4 +--
 .../src/providers/standardnotes/types.ts      | 35 +++++++++++++------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/packages/importer/package.json b/packages/importer/package.json
index 79be67e02..9fb6fd17c 100644
--- a/packages/importer/package.json
+++ b/packages/importer/package.json
@@ -12,8 +12,8 @@
     "@notesnook/enex": "^1.0.3",
     "@notesnook/onenote": "^1.0.2",
     "@notesnook/znel": "^1.0.0",
-    "@standardnotes/common": "^1.8.0",
-    "@standardnotes/features": "^1.25.0",
+    "@standardnotes/common": "^1.19.8",
+    "@standardnotes/features": "^1.42.1",
     "fflate": "^0.7.3",
     "highlight.js": "^11.4.0",
     "node-html-parser": "github:thecodrr/node-html-parser",
diff --git a/packages/importer/src/providers/standardnotes/types.ts b/packages/importer/src/providers/standardnotes/types.ts
index 0b3473d4e..416396f4d 100644
--- a/packages/importer/src/providers/standardnotes/types.ts
+++ b/packages/importer/src/providers/standardnotes/types.ts
@@ -1,18 +1,30 @@
-import type { AppDataField, BackupFile } from "@standardnotes/snjs";
-import { ComponentArea, EditorFeatureDescription, NoteType } from "@standardnotes/features";
+import {
+  AppDataField,
+  BackupFile,
+  BackupFileDecryptedContextualPayload,
+  ItemContent,
+} from "@standardnotes/snjs";
+import {
+  ComponentArea,
+  EditorFeatureDescription,
+  NoteType,
+} from "@standardnotes/features";
 import { ContentType } from "@standardnotes/common";
-import {RawPayload, NoteContent, TagContent, ComponentContent} from "@standardnotes/snjs";
+import { NoteContent, TagContent, ComponentContent } from "@standardnotes/snjs";
 
 enum ProtocolVersion {
   V001 = "001",
   V002 = "002",
   V003 = "003",
-  V004 = "004"
+  V004 = "004",
 }
-const ComponentDataDomain = 'org.standardnotes.sn.components';
+const ComponentDataDomain = "org.standardnotes.sn.components";
 const DefaultAppDomain = "org.standardnotes.sn";
 
-type SNBackupItem<TContentType extends ContentType, TContent> = RawPayload & {
+type SNBackupItem<
+  TContentType extends ContentType,
+  TContent extends ItemContent
+> = BackupFileDecryptedContextualPayload<TContent> & {
   content_type: TContentType;
   content: TContent & {
     appData: {
@@ -25,9 +37,7 @@ type SNBackupItem<TContentType extends ContentType, TContent> = RawPayload & {
 export type SNNote = SNBackupItem<ContentType.Note, NoteContent>;
 export type SNComponent = SNBackupItem<ContentType.Component, ComponentContent>;
 export type SNTag = SNBackupItem<ContentType.Tag, TagContent>;
-export type SNBackup = {
-  items: RawPayload[];
-} & BackupFile;
+export type SNBackup = BackupFile;
 export type EditorDescription = Pick<
   EditorFeatureDescription,
   "note_type" | "file_type"
@@ -41,7 +51,10 @@ export type Spreadsheet = {
 };
 
 export {
-  DefaultAppDomain, ComponentDataDomain, ProtocolVersion,
+  DefaultAppDomain,
+  ComponentDataDomain,
+  ProtocolVersion,
   ContentType,
-  ComponentArea, NoteType
+  ComponentArea,
+  NoteType,
 };