orgnote-api 0.42.3 → 0.42.6

package/models/settings-store.d.ts

@@ -1,11 +1,12 @@
-import type { Ref } from 'vue';
-import { OrgNoteSettings } from './orgnote-config.js';
-import { StoreDefinition } from './store.js';
+import type { Ref } from "vue";
+import { OrgNoteSettings } from "./orgnote-config.js";
+import { StoreDefinition } from "./store.js";
 import { ModelsAPIToken } from "../remote-api/index.js";
 export interface SettingsStore {
     settings: OrgNoteSettings;
     tokens: Ref<ModelsAPIToken[]>;
     onboardingCompleted: Ref<boolean>;
+    onboardingCurrentStep: Ref<number>;
     loadApiTokens: () => Promise<void>;
     createApiToken: () => Promise<void>;
     removeApiToken: (token: ModelsAPIToken) => Promise<void>;

package/models/sync-profile-config.d.ts

@@ -10,6 +10,7 @@ export declare const SyncProfileSchema: import("valibot").ObjectSchema<{
     readonly debug: import("valibot").OptionalSchema<import("valibot").BooleanSchema<undefined>, false>;
     readonly backupDir: import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, "">;
     readonly backupCount: import("valibot").OptionalSchema<import("valibot").NumberSchema<undefined>, 3>;
+    readonly ignorePatterns: import("valibot").OptionalSchema<import("valibot").ArraySchema<import("valibot").StringSchema<undefined>, undefined>, readonly []>;
 }, undefined>;
 export declare const SyncProfileConfigSchema: import("valibot").ObjectSchema<{
     readonly accounts: import("valibot").OptionalSchema<import("valibot").ArraySchema<import("valibot").ObjectSchema<{
@@ -23,6 +24,7 @@ export declare const SyncProfileConfigSchema: import("valibot").ObjectSchema<{
         readonly debug: import("valibot").OptionalSchema<import("valibot").BooleanSchema<undefined>, false>;
         readonly backupDir: import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, "">;
         readonly backupCount: import("valibot").OptionalSchema<import("valibot").NumberSchema<undefined>, 3>;
+        readonly ignorePatterns: import("valibot").OptionalSchema<import("valibot").ArraySchema<import("valibot").StringSchema<undefined>, undefined>, readonly []>;
     }, undefined>, undefined>, readonly []>;
     readonly root: import("valibot").OptionalSchema<import("valibot").ArraySchema<import("valibot").ObjectSchema<{
         readonly name: import("valibot").StringSchema<undefined>;
@@ -35,6 +37,7 @@ export declare const SyncProfileConfigSchema: import("valibot").ObjectSchema<{
         readonly debug: import("valibot").OptionalSchema<import("valibot").BooleanSchema<undefined>, false>;
         readonly backupDir: import("valibot").OptionalSchema<import("valibot").StringSchema<undefined>, "">;
         readonly backupCount: import("valibot").OptionalSchema<import("valibot").NumberSchema<undefined>, 3>;
+        readonly ignorePatterns: import("valibot").OptionalSchema<import("valibot").ArraySchema<import("valibot").StringSchema<undefined>, undefined>, readonly []>;
     }, undefined>, undefined>, readonly []>;
 }, undefined>;
 export type SyncProfile = InferOutput<typeof SyncProfileSchema>;

package/models/sync-profile-config.js

@@ -10,6 +10,7 @@ export const SyncProfileSchema = object({
     debug: optional(boolean(), false),
     backupDir: optional(string(), ''),
     backupCount: optional(number(), 3),
+    ignorePatterns: optional(array(string()), []),
 });
 export const SyncProfileConfigSchema = object({
     accounts: optional(array(SyncProfileSchema), []),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orgnote-api",
-  "version": "0.42.3",
+  "version": "0.42.6",
   "description": "Official API for creating extensions for OrgNote app",
   "type": "module",
   "main": "./index.js",
@@ -53,6 +53,7 @@
     "openpgp": "6.3.0",
     "org-mode-ast": "0.11.8",
     "partysocket": "1.1.6",
+    "picomatch": "4.0.4",
     "smol-toml": "1.5.2"
   },
   "devDependencies": {
@@ -61,6 +62,7 @@
     "@rollup/rollup-linux-arm64-gnu": "4.14.2",
     "@types/diff-match-patch": "^1.0.36",
     "@types/node": "22.14.1",
+    "@types/picomatch": "4.0.3",
     "eslint": "9.25.1",
     "eslint-plugin-sonarjs": "3.0.5",
     "fix-esm-import-path": "1.10.1",

package/sync/scan.js

@@ -1,24 +1,30 @@
-import { toAbsolutePath } from "../utils/to-absolute-path.js";
-const DEFAULT_IGNORE = [
+import { toAbsolutePath, toRelativePath } from "../utils/to-absolute-path.js";
+import picomatch from 'picomatch';
+const DEFAULT_IGNORE_PATTERNS = [
     '.git',
+    '.jj',
+    '.hg',
+    '.svn',
     '.DS_Store',
     'node_modules',
     '.sync-state',
     '.Trash',
 ];
+const compileMatchers = (patterns) => patterns.map((p) => picomatch(p, { dot: true }));
 export async function scanLocalFiles(fs, rootPath, ignorePatterns = []) {
-    const ignore = [...DEFAULT_IGNORE, ...ignorePatterns];
-    return scanDir(fs, rootPath, ignore);
+    const allPatterns = [...DEFAULT_IGNORE_PATTERNS, ...ignorePatterns];
+    const matchers = compileMatchers(allPatterns);
+    return scanDir(fs, rootPath, matchers);
 }
-async function scanDir(fs, path, ignore) {
-    const entries = await fs.readDir(path);
-    const filteredEntries = entries.filter((e) => !shouldIgnore(e.name, ignore));
-    const nestedResults = await Promise.all(filteredEntries.map((entry) => processEntry(fs, entry, ignore)));
+async function scanDir(fs, dirPath, matchers) {
+    const entries = await fs.readDir(dirPath);
+    const filteredEntries = entries.filter((e) => !shouldIgnore(e.name, toRelativePath(e.path), matchers));
+    const nestedResults = await Promise.all(filteredEntries.map((entry) => processEntry(fs, entry, matchers)));
     return nestedResults.flat();
 }
-async function processEntry(fs, entry, ignore) {
+async function processEntry(fs, entry, matchers) {
     if (entry.type === 'directory') {
-        return scanDir(fs, entry.path, ignore);
+        return scanDir(fs, entry.path, matchers);
     }
     return [toLocalFile(entry)];
 }
@@ -27,13 +33,7 @@ const toLocalFile = (entry) => ({
     mtime: entry.mtime,
     size: entry.size,
 });
-const shouldIgnore = (name, patterns) => patterns.some((pattern) => matchPattern(pattern, name));
-const matchPattern = (pattern, name) => {
-    if (!pattern.includes('*'))
-        return name === pattern;
-    const regex = new RegExp('^' + pattern.replace(/\*/g, '.*') + '$');
-    return regex.test(name);
-};
+const shouldIgnore = (name, relativePath, matchers) => matchers.some((match) => match(name) || match(relativePath));
 export const findDeletedLocally = (localFiles, stateData) => {
     const localPaths = new Set(localFiles.map((f) => f.path));
     return Object.keys(stateData.files).filter((path) => !localPaths.has(path));