orgnote-api 0.40.0 → 0.40.11

package/constants/i18n-keys.d.ts

@@ -143,7 +143,6 @@ export declare enum i18n {
     AUTH_LOGIN = "login",
     AUTH_LOGIN_DESCRIPTION = "sign in to your account",
     AUTH_INVALID_CALLBACK_PARAMS = "invalid authentication callback parameters",
-    AUTH_REMOVE_ACCOUNT = "remove account",
     AUTH_REMOVE_ACCOUNT_DESCRIPTION = "permanently delete your account",
     AUTH_GROUP = "auth"
 }
@@ -364,7 +363,6 @@ export declare const I18N: {
     AUTH_LOGIN: i18n.AUTH_LOGIN;
     AUTH_LOGIN_DESCRIPTION: i18n.AUTH_LOGIN_DESCRIPTION;
     AUTH_INVALID_CALLBACK_PARAMS: i18n.AUTH_INVALID_CALLBACK_PARAMS;
-    AUTH_REMOVE_ACCOUNT: i18n.REMOVE_ACCOUNT;
     AUTH_REMOVE_ACCOUNT_DESCRIPTION: i18n.AUTH_REMOVE_ACCOUNT_DESCRIPTION;
     AUTH_GROUP: i18n.AUTH_GROUP;
 };

package/constants/i18n-keys.js

@@ -148,7 +148,6 @@ export var i18n;
     i18n["AUTH_LOGIN"] = "login";
     i18n["AUTH_LOGIN_DESCRIPTION"] = "sign in to your account";
     i18n["AUTH_INVALID_CALLBACK_PARAMS"] = "invalid authentication callback parameters";
-    i18n["AUTH_REMOVE_ACCOUNT"] = "remove account";
     i18n["AUTH_REMOVE_ACCOUNT_DESCRIPTION"] = "permanently delete your account";
     i18n["AUTH_GROUP"] = "auth";
 })(i18n || (i18n = {}));

package/constants/route-paths.d.ts

@@ -1,5 +1,5 @@
 export declare const RoutePaths: {
-    readonly AUTH_LOGIN: "auth/login";
+    readonly AUTH_LOGIN: "auth";
     readonly AUTH_ACTIVATE: "auth/activate";
 };
 export type RoutePath = (typeof RoutePaths)[keyof typeof RoutePaths];

package/constants/route-paths.js

@@ -1,4 +1,4 @@
 export const RoutePaths = {
-    AUTH_LOGIN: 'auth/login',
+    AUTH_LOGIN: 'auth',
     AUTH_ACTIVATE: 'auth/activate',
 };

package/encryption/__tests__/note-encryption.spec.js

@@ -1,9 +1,12 @@
-import { expect, test } from 'vitest';
+import { beforeEach, expect, test } from 'vitest';
 import { decryptNote, encryptNote } from "../note-encryption.js";
 import { armoredPublicKey, armoredPrivateKey, privateKeyPassphrase, } from "./encryption-keys.js";
 import { EncryptionType } from "../../models/encryption.js";
 import { faker } from '@faker-js/faker';
-// Helper function to generate a NoteInfo object
+beforeEach(() => {
+    faker.seed(1);
+    faker.setDefaultRefDate(new Date('2024-01-01T00:00:00.000Z'));
+});
 function generateNoteInfo(overrides = {}) {
     return {
         id: faker.string.uuid(),
@@ -34,30 +37,38 @@ function generateNoteInfo(overrides = {}) {
     };
 }
 test('Should encrypt note via keys', async () => {
-    const noteText = faker.lorem.paragraphs();
+    const noteText = '#+title: Test note\n\nBody text';
     const note = generateNoteInfo();
+    note.meta.published = false;
     const [encryptedNote, encryptedNoteText] = await encryptNote(note, {
         content: noteText,
         type: EncryptionType.GpgKeys,
-        publicKey: armoredPublicKey, // Используем armoredPublicKey
-        privateKey: armoredPrivateKey, // Используем armoredPrivateKey
-        privateKeyPassphrase, // Используем privateKeyPassphrase
+        publicKey: armoredPublicKey,
+        privateKey: armoredPrivateKey,
+        privateKeyPassphrase,
         format: 'armored',
     });
     expect(encryptedNoteText.startsWith('-----BEGIN PGP MESSAGE-----')).toBe(true);
     expect(encryptedNote).toMatchSnapshot();
 });
 test('Should decrypt note via keys', async () => {
-    const encryptedNoteText = `-----BEGIN PGP MESSAGE-----
-  ${faker.lorem.paragraphs()}
-  -----END PGP MESSAGE-----`;
+    const noteText = '#+title: Test note\n\nBody text';
     const note = generateNoteInfo();
+    note.meta.published = false;
+    const [, encryptedNoteText] = await encryptNote(note, {
+        content: noteText,
+        type: EncryptionType.GpgKeys,
+        publicKey: armoredPublicKey,
+        privateKey: armoredPrivateKey,
+        privateKeyPassphrase,
+        format: 'armored',
+    });
     const decryptedNote = await decryptNote(note, {
         content: encryptedNoteText,
         type: EncryptionType.GpgKeys,
-        publicKey: armoredPublicKey, // Используем armoredPublicKey
-        privateKey: armoredPrivateKey, // Используем armoredPrivateKey
-        privateKeyPassphrase, // Используем privateKeyPassphrase
+        publicKey: armoredPublicKey,
+        privateKey: armoredPrivateKey,
+        privateKeyPassphrase,
     });
     expect(decryptedNote).toMatchSnapshot();
 });

package/models/auth-state.d.ts

@@ -0,0 +1,9 @@
+import { type InferOutput } from 'valibot';
+export declare const AUTH_ENVIRONMENTS: readonly ["web", "mobile", "electron", "desktop"];
+export type AuthEnvironment = (typeof AUTH_ENVIRONMENTS)[number];
+export declare const AUTH_ENVIRONMENT_SCHEMA: import("valibot").UnionSchema<[import("valibot").LiteralSchema<"web", undefined>, import("valibot").LiteralSchema<"mobile", undefined>, import("valibot").LiteralSchema<"electron", undefined>, import("valibot").LiteralSchema<"desktop", undefined>], undefined>;
+export declare const AUTH_STATE_SCHEMA: import("valibot").ObjectSchema<{
+    readonly environment: import("valibot").UnionSchema<[import("valibot").LiteralSchema<"web", undefined>, import("valibot").LiteralSchema<"mobile", undefined>, import("valibot").LiteralSchema<"electron", undefined>, import("valibot").LiteralSchema<"desktop", undefined>], undefined>;
+    readonly redirectUrl: import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, undefined>;
+}, undefined>;
+export type AuthState = InferOutput<typeof AUTH_STATE_SCHEMA>;

package/models/auth-state.js

@@ -0,0 +1,12 @@
+import { literal, object, optional, string, union, } from 'valibot';
+export const AUTH_ENVIRONMENTS = ['web', 'mobile', 'electron', 'desktop'];
+export const AUTH_ENVIRONMENT_SCHEMA = union([
+    literal('web'),
+    literal('mobile'),
+    literal('electron'),
+    literal('desktop'),
+]);
+export const AUTH_STATE_SCHEMA = object({
+    environment: AUTH_ENVIRONMENT_SCHEMA,
+    redirectUrl: optional(string()),
+});

package/models/encryption.d.ts

@@ -14,11 +14,11 @@ export interface BaseOrgNoteDecryption {
 }
 declare const OrgNoteGpgEncryptionSchema: import("valibot").ObjectSchema<{
     readonly type: import("valibot").LiteralSchema<"gpgKeys", undefined>;
-    readonly privateKey: import("valibot").SchemaWithPipe<readonly [import("valibot").StringSchema<undefined>, import("valibot").MetadataAction<string, {
+    readonly privateKey: import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").MetadataAction<string, {
         readonly textarea: true;
         readonly upload: true;
     }>]>;
-    readonly publicKey: import("valibot").SchemaWithPipe<readonly [import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, undefined>, import("valibot").MetadataAction<string, {
+    readonly publicKey: import("valibot").SchemaWithPipe<[import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, undefined>, import("valibot").MetadataAction<string, {
         readonly textarea: true;
         readonly upload: true;
     }>]>;
@@ -30,13 +30,13 @@ declare const OrgNotePasswordEncryptionSchema: import("valibot").ObjectSchema<{
 }, undefined>;
 export declare const OrgNoteEncryptionSchema: import("valibot").IntersectSchema<[import("valibot").ObjectSchema<{
     readonly encryptFilesByDefault: import("valibot").OptionalSchema<import("valibot").BooleanSchema<undefined>, undefined>;
-}, undefined>, import("valibot").SchemaWithPipe<readonly [import("valibot").UnionSchema<[import("valibot").ObjectSchema<{
+}, undefined>, import("valibot").SchemaWithPipe<[import("valibot").UnionSchema<[import("valibot").ObjectSchema<{
     readonly type: import("valibot").LiteralSchema<"gpgKeys", undefined>;
-    readonly privateKey: import("valibot").SchemaWithPipe<readonly [import("valibot").StringSchema<undefined>, import("valibot").MetadataAction<string, {
+    readonly privateKey: import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").MetadataAction<string, {
         readonly textarea: true;
         readonly upload: true;
     }>]>;
-    readonly publicKey: import("valibot").SchemaWithPipe<readonly [import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, undefined>, import("valibot").MetadataAction<string, {
+    readonly publicKey: import("valibot").SchemaWithPipe<[import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, undefined>, import("valibot").MetadataAction<string, {
         readonly textarea: true;
         readonly upload: true;
     }>]>;

package/models/index.d.ts

@@ -15,6 +15,7 @@ export * from './file-info.js';
 export * from './file-path.js';
 export * from './user.js';
 export * from './oauth-provider.js';
+export * from './auth-state.js';
 export * from './orgnote-config.js';
 export * from './platform-specific.js';
 export * from './css-utils.js';

package/models/index.js

@@ -15,6 +15,7 @@ export * from "./file-info.js";
 export * from "./file-path.js";
 export * from "./user.js";
 export * from "./oauth-provider.js";
+export * from "./auth-state.js";
 export * from "./orgnote-config.js";
 export * from "./platform-specific.js";
 export * from "./css-utils.js";

package/models/menu-action.d.ts

@@ -1,11 +1,11 @@
 import { CommandName } from './command.js';
 type DefinedMenuGroup = 'file' | 'dir' | 'tab';
 export type MenuGroup = DefinedMenuGroup | (string & {});
-export interface MenuActionBase<T = unknown> {
+export interface MenuActionBase {
     icon?: string;
     title?: string;
 }
-export interface ManualMenuAction<T = unknown> extends MenuActionBase<T> {
+export interface ManualMenuAction<T = unknown> extends MenuActionBase {
     handler: (data: T) => void;
 }
 export interface CommandMenuAction extends MenuActionBase {

package/models/orgnote-config.d.ts

@@ -1,5 +1,5 @@
 import { InferOutput } from 'valibot';
-export declare const ORG_NOTE_CONFIG_SCHEMA: import("valibot").SchemaWithPipe<readonly [import("valibot").ObjectWithRestSchema<{
+export declare const ORG_NOTE_CONFIG_SCHEMA: import("valibot").SchemaWithPipe<[import("valibot").ObjectWithRestSchema<{
     readonly editor: import("valibot").ObjectSchema<{
         readonly showSpecialSymbols: import("valibot").BooleanSchema<undefined>;
         readonly showPropertyDrawer: import("valibot").BooleanSchema<undefined>;
@@ -39,13 +39,13 @@ export declare const ORG_NOTE_CONFIG_SCHEMA: import("valibot").SchemaWithPipe<re
     }, undefined>;
     readonly encryption: import("valibot").IntersectSchema<[import("valibot").ObjectSchema<{
         readonly encryptFilesByDefault: import("valibot").OptionalSchema<import("valibot").BooleanSchema<undefined>, undefined>;
-    }, undefined>, import("valibot").SchemaWithPipe<readonly [import("valibot").UnionSchema<[import("valibot").ObjectSchema<{
+    }, undefined>, import("valibot").SchemaWithPipe<[import("valibot").UnionSchema<[import("valibot").ObjectSchema<{
         readonly type: import("valibot").LiteralSchema<"gpgKeys", undefined>;
-        readonly privateKey: import("valibot").SchemaWithPipe<readonly [import("valibot").StringSchema<undefined>, import("valibot").MetadataAction<string, {
+        readonly privateKey: import("valibot").SchemaWithPipe<[import("valibot").StringSchema<undefined>, import("valibot").MetadataAction<string, {
             readonly textarea: true;
             readonly upload: true;
         }>]>;
-        readonly publicKey: import("valibot").SchemaWithPipe<readonly [import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, undefined>, import("valibot").MetadataAction<string, {
+        readonly publicKey: import("valibot").SchemaWithPipe<[import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, undefined>, import("valibot").MetadataAction<string, {
             readonly textarea: true;
             readonly upload: true;
         }>]>;

package/models/user.d.ts

@@ -1,6 +1,4 @@
 import { ModelsUserPersonalInfo } from "../remote-api/index.js";
 import { PublicUser } from './note.js';
-export interface User extends PublicUser {
-}
-export interface PersonalInfo extends ModelsUserPersonalInfo {
-}
+export type User = PublicUser;
+export type PersonalInfo = ModelsUserPersonalInfo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orgnote-api",
-  "version": "0.40.0",
+  "version": "0.40.11",
   "description": "Official API for creating extensions for OrgNote app",
   "type": "module",
   "main": "./index.js",
@@ -16,12 +16,12 @@
     "codegen:css-types": "node collect-css-variables.cjs --types",
     "fix-esm-imports": "fix-esm-import-path ./dist",
     "prepub": "bun run build && bun run fix-esm-imports && cp -rf package.json package-lock.json README.md dist/",
-    "pub": "bun run prepub && cd dist && bun publish",
+    "pub": "bun run prepub && cd dist && npm publish",
     "pub:yalc": "bun run prepub && cd dist && yalc publish --push"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/artawower/orgnote-api.git"
+    "url": "https://github.com/Artawower/orgnote-api"
   },
   "exports": {
     ".": "./index.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "axios": "1.8.4",
     "neverthrow": "^8.2.0",
-    "openpgp": "6.1.0",
+    "openpgp": "6.3.0",
     "org-mode-ast": "0.11.8",
     "partysocket": "1.1.6",
     "smol-toml": "1.5.2"

package/remote-api/api.d.ts

@@ -886,7 +886,7 @@ export declare const EventsApiAxiosParamCreator: (configuration?: Configuration)
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
-    wsV1EventsGet: (token?: string, options?: RawAxiosRequestConfig) => Promise<RequestArgs>;
+    wsEventsGet: (token?: string, options?: RawAxiosRequestConfig) => Promise<RequestArgs>;
 };
 /**
  * EventsApi - functional programming interface
@@ -900,7 +900,7 @@ export declare const EventsApiFp: (configuration?: Configuration) => {
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
-    wsV1EventsGet(token?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>>;
+    wsEventsGet(token?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>>;
 };
 /**
  * EventsApi - factory interface
@@ -914,7 +914,7 @@ export declare const EventsApiFactory: (configuration?: Configuration, basePath?
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      */
-    wsV1EventsGet(token?: string, options?: any): AxiosPromise<void>;
+    wsEventsGet(token?: string, options?: any): AxiosPromise<void>;
 };
 /**
  * EventsApi - object-oriented interface
@@ -931,7 +931,7 @@ export declare class EventsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EventsApi
      */
-    wsV1EventsGet(token?: string, options?: RawAxiosRequestConfig): Promise<import("axios").AxiosResponse<void, any>>;
+    wsEventsGet(token?: string, options?: RawAxiosRequestConfig): Promise<import("axios").AxiosResponse<void, any>>;
 }
 /**
  * SyncApi - axios parameter creator

package/remote-api/api.js

@@ -604,8 +604,8 @@ export const EventsApiAxiosParamCreator = function (configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        wsV1EventsGet: async (token, options = {}) => {
-            const localVarPath = `/ws/v1/events`;
+        wsEventsGet: async (token, options = {}) => {
+            const localVarPath = `/ws/events`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
             let baseOptions;
@@ -642,10 +642,10 @@ export const EventsApiFp = function (configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async wsV1EventsGet(token, options) {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.wsV1EventsGet(token, options);
+        async wsEventsGet(token, options) {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.wsEventsGet(token, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['EventsApi.wsV1EventsGet']?.[localVarOperationServerIndex]?.url;
+            const localVarOperationServerBasePath = operationServerMap['EventsApi.wsEventsGet']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     };
@@ -664,8 +664,8 @@ export const EventsApiFactory = function (configuration, basePath, axios) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        wsV1EventsGet(token, options) {
-            return localVarFp.wsV1EventsGet(token, options).then((request) => request(axios, basePath));
+        wsEventsGet(token, options) {
+            return localVarFp.wsEventsGet(token, options).then((request) => request(axios, basePath));
         },
     };
 };
@@ -684,8 +684,8 @@ export class EventsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EventsApi
      */
-    wsV1EventsGet(token, options) {
-        return EventsApiFp(this.configuration).wsV1EventsGet(token, options).then((request) => request(this.axios, this.basePath));
+    wsEventsGet(token, options) {
+        return EventsApiFp(this.configuration).wsEventsGet(token, options).then((request) => request(this.axios, this.basePath));
     }
 }
 /**

package/remote-api/index.d.ts

@@ -9,5 +9,5 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-export * from "./api.js";
-export * from "./configuration.js";
+export * from './api.js';
+export * from './configuration.js';

package/remote-api/index.js

@@ -1,5 +1,4 @@
 /* tslint:disable */
-/* eslint-disable */
 /**
  * Org Note API
  * List of methods for work with Org Note.

package/utils/auth-state.d.ts

@@ -0,0 +1,5 @@
+import { type AuthEnvironment, type AuthState } from '../models/auth-state.js';
+export declare const DEFAULT_AUTH_STATE: AuthState;
+export declare const isAuthEnvironment: (value: string | undefined) => value is AuthEnvironment;
+export declare const decodeAuthState: (rawState: string) => AuthState;
+export declare const encodeAuthState: (state: AuthState) => string;

package/utils/auth-state.js

@@ -0,0 +1,18 @@
+import { safeParse } from 'valibot';
+import { AUTH_ENVIRONMENTS, AUTH_STATE_SCHEMA } from "../models/auth-state.js";
+import { to } from "./to-error.js";
+export const DEFAULT_AUTH_STATE = { environment: 'web' };
+export const isAuthEnvironment = (value) => Boolean(value && AUTH_ENVIRONMENTS.includes(value));
+export const decodeAuthState = (rawState) => {
+    if (!rawState)
+        return DEFAULT_AUTH_STATE;
+    const safeJsonParse = to(() => JSON.parse(rawState));
+    const parsed = safeJsonParse();
+    if (parsed.isErr())
+        return DEFAULT_AUTH_STATE;
+    const validated = safeParse(AUTH_STATE_SCHEMA, parsed.value);
+    if (!validated.success)
+        return DEFAULT_AUTH_STATE;
+    return validated.output;
+};
+export const encodeAuthState = (state) => JSON.stringify(state);

package/utils/index.d.ts

@@ -9,4 +9,5 @@ export * from './get-parent-dir.js';
 export * from './toml.js';
 export * from './to-absolute-path.js';
 export * from './to-error.js';
+export * from './auth-state.js';
 export * from './nullable-guards.js';

package/utils/index.js

@@ -9,4 +9,5 @@ export * from "./get-parent-dir.js";
 export * from "./toml.js";
 export * from "./to-absolute-path.js";
 export * from "./to-error.js";
+export * from "./auth-state.js";
 export * from "./nullable-guards.js";

package/utils/toml.d.ts

@@ -1,3 +1,3 @@
-import { BaseSchema, InferOutput } from 'valibot';
-export declare function parseToml<T = unknown, S extends BaseSchema<unknown, unknown, any> | undefined = undefined>(content: string, schema?: S): S extends BaseSchema<unknown, unknown, any> ? InferOutput<S> : T;
+import { BaseIssue, BaseSchema, InferOutput } from 'valibot';
+export declare function parseToml<T = unknown, S extends BaseSchema<unknown, unknown, BaseIssue<unknown>> | undefined = undefined>(content: string, schema?: S): S extends BaseSchema<unknown, unknown, BaseIssue<unknown>> ? InferOutput<S> : T;
 export declare function stringifyToml(data: unknown): string;