obsidian-dev-utils 3.28.1 → 3.28.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # CHANGELOG
2
2
 
3
+ ## 3.28.2
4
+
5
+ - Refactor
6
+
3
7
  ## 3.28.1
4
8
 
5
9
  - Avoid extra dot
@@ -30,7 +30,6 @@ __export(AttachmentPath_exports, {
30
30
  getAvailablePathForAttachments: () => getAvailablePathForAttachments
31
31
  });
32
32
  module.exports = __toCommonJS(AttachmentPath_exports);
33
- var import_obsidian = require('obsidian');
34
33
  var import_implementations = require('obsidian-typings/implementations');
35
34
  var import_Path = require('../Path.cjs');
36
35
  var import_String = require('../String.cjs');
@@ -75,7 +74,7 @@ async function getAvailablePathForAttachments(app, filename, extension, file, sk
75
74
  }
76
75
  attachmentFolderPath = (0, import_String.normalize)(normalizeSlashes(attachmentFolderPath));
77
76
  filename = (0, import_String.normalize)(normalizeSlashes(filename));
78
- let folder = (0, import_FileSystem.getAbstractFileOrNull)(app, attachmentFolderPath, true);
77
+ let folder = (0, import_FileSystem.getFolderOrNull)(app, attachmentFolderPath, true);
79
78
  if (!folder && relativePath) {
80
79
  if (!skipFolderCreation) {
81
80
  folder = await app.vault.createFolder(attachmentFolderPath);
@@ -83,11 +82,8 @@ async function getAvailablePathForAttachments(app, filename, extension, file, sk
83
82
  folder = (0, import_implementations.createTFolderInstance)(app.vault, attachmentFolderPath);
84
83
  }
85
84
  }
86
- if (folder instanceof import_obsidian.TFolder) {
87
- return app.vault.getAvailablePath(folder.getParentPrefix() + filename, extension);
88
- } else {
89
- return app.vault.getAvailablePath(filename, extension);
90
- }
85
+ const prefix = folder?.getParentPrefix() ?? "";
86
+ return app.vault.getAvailablePath(prefix + filename, extension);
91
87
  }
92
88
  function normalizeSlashes(path) {
93
89
  path = path.replace(/([\\/])+/g, "/");
@@ -100,4 +96,4 @@ function normalizeSlashes(path) {
100
96
  getAttachmentFolderPath,
101
97
  getAvailablePathForAttachments
102
98
  });
103
- //# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/obsidian/AttachmentPath.ts"],
  "sourcesContent": ["var __import_meta_url = globalThis['import.meta.url'] ?? (()=>{if(typeof __filename!==\"string\"){return new URL(window.location.href)}return require(\"node:url\").pathToFileURL(__filename)})();\nvar __process = globalThis['process'] ?? {\n  \"cwd\": ()=>\"/\",\n  \"env\": {},\n  \"platform\": \"android\"\n};\n/**\n * @packageDocumentation AttachmentPath\n * Provides utility functions for working with attachment paths.\n */\n\nimport type {\n  App,\n  TAbstractFile\n} from 'obsidian';\nimport { TFolder } from 'obsidian';\nimport {\n  createTFileInstance,\n  createTFolderInstance,\n  parentFolderPath\n} from 'obsidian-typings/implementations';\n\nimport {\n  basename,\n  extname\n} from '../Path.ts';\nimport {\n  normalize,\n  trimStart\n} from '../String.ts';\nimport type { PathOrFile } from './FileSystem.ts';\nimport {\n  getAbstractFileOrNull,\n  getPath\n} from './FileSystem.ts';\n\n/**\n * Retrieves the attachment folder path for a given note.\n *\n * @param app - The Obsidian application instance.\n * @param notePathOrFile - The path of the note.\n * @returns A promise that resolves to the attachment folder path.\n */\nexport async function getAttachmentFolderPath(app: App, notePathOrFile: PathOrFile): Promise<string> {\n  return parentFolderPath(await getAttachmentFilePath(app, 'DUMMY_FILE.pdf', notePathOrFile));\n}\n\n/**\n * Is overridden wrapper.\n */\nexport interface ExtendedWrapper {\n  /**\n   * Is extended.\n   */\n  isExtended: true;\n}\n\n/**\n * Get available path for attachments function.\n */\nexport type GetAvailablePathForAttachmentsExtendedFn = (filename: string, extension: string, file: TAbstractFile | null, skipFolderCreation?: boolean) => Promise<string>;\n\n/**\n * Retrieves the file path for an attachment within a note.\n *\n * @param app - The Obsidian application instance.\n * @param attachmentPathOrFile - The path of the attachment.\n * @param notePathOrFile - The path of the note.\n * @returns A promise that resolves to the file path of the attachment.\n */\nexport async function getAttachmentFilePath(app: App, attachmentPathOrFile: PathOrFile, notePathOrFile: PathOrFile): Promise<string> {\n  const attachmentPath = getPath(attachmentPathOrFile);\n  const notePath = getPath(notePathOrFile);\n  const note = createTFileInstance(app.vault, notePath);\n  const ext = extname(attachmentPath);\n  const fileName = basename(attachmentPath, ext);\n\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  const internalFn = app.vault.getAvailablePathForAttachments;\n  if ((internalFn as Partial<ExtendedWrapper>).isExtended) {\n    return (internalFn as GetAvailablePathForAttachmentsExtendedFn)(fileName, ext.slice(1), note, true);\n  }\n\n  return await getAvailablePathForAttachments(app, fileName, ext.slice(1), note, true);\n}\n\n/**\n * Retrieves the available path for attachments.\n * @param app - The Obsidian application instance.\n * @param filename - Name of the file.\n * @param extension - Extension of the file.\n * @param file - The file to attach to.\n * @param skipFolderCreation - Should folder creation be skipped?\n * @returns A promise that resolves to the available path for attachments.\n */\nexport async function getAvailablePathForAttachments(app: App, filename: string, extension: string, file: TAbstractFile | null, skipFolderCreation: boolean): Promise<string> {\n  let attachmentFolderPath = app.vault.getConfig('attachmentFolderPath') as string;\n  const isCurrentFolder = attachmentFolderPath === '.' || attachmentFolderPath === './';\n  let relativePath = null;\n\n  if (attachmentFolderPath.startsWith('./')) {\n    relativePath = trimStart(attachmentFolderPath, './');\n  }\n\n  if (isCurrentFolder) {\n    attachmentFolderPath = file ? file.parent?.path ?? '' : '';\n  } else if (relativePath) {\n    attachmentFolderPath = (file ? file.parent?.getParentPrefix() ?? '' : '') + relativePath;\n  }\n\n  attachmentFolderPath = normalize(normalizeSlashes(attachmentFolderPath));\n  filename = normalize(normalizeSlashes(filename));\n\n  let folder = getAbstractFileOrNull(app, attachmentFolderPath, true);\n\n  if (!folder && relativePath) {\n    if (!skipFolderCreation) {\n      folder = await app.vault.createFolder(attachmentFolderPath);\n    } else {\n      folder = createTFolderInstance(app.vault, attachmentFolderPath);\n    }\n  }\n\n  if (folder instanceof TFolder) {\n    return app.vault.getAvailablePath(folder.getParentPrefix() + filename, extension);\n  } else {\n    return app.vault.getAvailablePath(filename, extension);\n  }\n}\n\n/**\n * Normalizes a path by combining multiple slashes into a single slash and removing leading and trailing slashes.\n * @param path - Path to normalize.\n * @returns The normalized path.\n */\nfunction normalizeSlashes(path: string): string {\n  path = path.replace(/([\\\\/])+/g, '/');\n  path = path.replace(/(^\\/+|\\/+$)/g, '');\n  return path || '/';\n}\n"],
  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAeA,sBAAwB;AACxB,6BAIO;AAEP,kBAGO;AACP,oBAGO;AAEP,wBAGO;AAlCP,IAAI,oBAAoB,WAAW,iBAAiB,MAAM,MAAI;AAAC,MAAG,OAAO,eAAa,UAAS;AAAC,WAAO,IAAI,IAAI,OAAO,SAAS,IAAI;AAAA,EAAC;AAAC,SAAO,QAAQ,UAAU,EAAE,cAAc,UAAU;AAAC,GAAG;AAC5L,IAAI,YAAY,WAAW,SAAS,KAAK;AAAA,EACvC,OAAO,MAAI;AAAA,EACX,OAAO,CAAC;AAAA,EACR,YAAY;AACd;AAsCA,eAAsB,wBAAwB,KAAU,gBAA6C;AACnG,aAAO,yCAAiB,MAAM,sBAAsB,KAAK,kBAAkB,cAAc,CAAC;AAC5F;AAyBA,eAAsB,sBAAsB,KAAU,sBAAkC,gBAA6C;AACnI,QAAM,qBAAiB,2BAAQ,oBAAoB;AACnD,QAAM,eAAW,2BAAQ,cAAc;AACvC,QAAM,WAAO,4CAAoB,IAAI,OAAO,QAAQ;AACpD,QAAM,UAAM,qBAAQ,cAAc;AAClC,QAAM,eAAW,sBAAS,gBAAgB,GAAG;AAG7C,QAAM,aAAa,IAAI,MAAM;AAC7B,MAAK,WAAwC,YAAY;AACvD,WAAQ,WAAwD,UAAU,IAAI,MAAM,CAAC,GAAG,MAAM,IAAI;AAAA,EACpG;AAEA,SAAO,MAAM,+BAA+B,KAAK,UAAU,IAAI,MAAM,CAAC,GAAG,MAAM,IAAI;AACrF;AAWA,eAAsB,+BAA+B,KAAU,UAAkB,WAAmB,MAA4B,oBAA8C;AAC5K,MAAI,uBAAuB,IAAI,MAAM,UAAU,sBAAsB;AACrE,QAAM,kBAAkB,yBAAyB,OAAO,yBAAyB;AACjF,MAAI,eAAe;AAEnB,MAAI,qBAAqB,WAAW,IAAI,GAAG;AACzC,uBAAe,yBAAU,sBAAsB,IAAI;AAAA,EACrD;AAEA,MAAI,iBAAiB;AACnB,2BAAuB,OAAO,KAAK,QAAQ,QAAQ,KAAK;AAAA,EAC1D,WAAW,cAAc;AACvB,4BAAwB,OAAO,KAAK,QAAQ,gBAAgB,KAAK,KAAK,MAAM;AAAA,EAC9E;AAEA,6BAAuB,yBAAU,iBAAiB,oBAAoB,CAAC;AACvE,iBAAW,yBAAU,iBAAiB,QAAQ,CAAC;AAE/C,MAAI,aAAS,yCAAsB,KAAK,sBAAsB,IAAI;AAElE,MAAI,CAAC,UAAU,cAAc;AAC3B,QAAI,CAAC,oBAAoB;AACvB,eAAS,MAAM,IAAI,MAAM,aAAa,oBAAoB;AAAA,IAC5D,OAAO;AACL,mBAAS,8CAAsB,IAAI,OAAO,oBAAoB;AAAA,IAChE;AAAA,EACF;AAEA,MAAI,kBAAkB,yBAAS;AAC7B,WAAO,IAAI,MAAM,iBAAiB,OAAO,gBAAgB,IAAI,UAAU,SAAS;AAAA,EAClF,OAAO;AACL,WAAO,IAAI,MAAM,iBAAiB,UAAU,SAAS;AAAA,EACvD;AACF;AAOA,SAAS,iBAAiB,MAAsB;AAC9C,SAAO,KAAK,QAAQ,aAAa,GAAG;AACpC,SAAO,KAAK,QAAQ,gBAAgB,EAAE;AACtC,SAAO,QAAQ;AACjB;",
  "names": []
}

99
+ //# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/obsidian/AttachmentPath.ts"],
  "sourcesContent": ["var __import_meta_url = globalThis['import.meta.url'] ?? (()=>{if(typeof __filename!==\"string\"){return new URL(window.location.href)}return require(\"node:url\").pathToFileURL(__filename)})();\nvar __process = globalThis['process'] ?? {\n  \"cwd\": ()=>\"/\",\n  \"env\": {},\n  \"platform\": \"android\"\n};\n/**\n * @packageDocumentation AttachmentPath\n * Provides utility functions for working with attachment paths.\n */\n\nimport type {\n  App,\n  TFile\n} from 'obsidian';\nimport {\n  createTFileInstance,\n  createTFolderInstance,\n  parentFolderPath\n} from 'obsidian-typings/implementations';\n\nimport {\n  basename,\n  extname\n} from '../Path.ts';\nimport {\n  normalize,\n  trimStart\n} from '../String.ts';\nimport type { PathOrFile } from './FileSystem.ts';\nimport {\n  getFolderOrNull,\n  getPath\n} from './FileSystem.ts';\n\n/**\n * Retrieves the attachment folder path for a given note.\n *\n * @param app - The Obsidian application instance.\n * @param notePathOrFile - The path of the note.\n * @returns A promise that resolves to the attachment folder path.\n */\nexport async function getAttachmentFolderPath(app: App, notePathOrFile: PathOrFile): Promise<string> {\n  return parentFolderPath(await getAttachmentFilePath(app, 'DUMMY_FILE.pdf', notePathOrFile));\n}\n\n/**\n * Is overridden wrapper.\n */\nexport interface ExtendedWrapper {\n  /**\n   * Is extended.\n   */\n  isExtended: true;\n}\n\n/**\n * Get available path for attachments function.\n */\nexport type GetAvailablePathForAttachmentsExtendedFn = (filename: string, extension: string, file: TFile | null, skipFolderCreation?: boolean) => Promise<string>;\n\n/**\n * Retrieves the file path for an attachment within a note.\n *\n * @param app - The Obsidian application instance.\n * @param attachmentPathOrFile - The path of the attachment.\n * @param notePathOrFile - The path of the note.\n * @returns A promise that resolves to the file path of the attachment.\n */\nexport async function getAttachmentFilePath(app: App, attachmentPathOrFile: PathOrFile, notePathOrFile: PathOrFile): Promise<string> {\n  const attachmentPath = getPath(attachmentPathOrFile);\n  const notePath = getPath(notePathOrFile);\n  const note = createTFileInstance(app.vault, notePath);\n  const ext = extname(attachmentPath);\n  const fileName = basename(attachmentPath, ext);\n\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  const internalFn = app.vault.getAvailablePathForAttachments;\n  if ((internalFn as Partial<ExtendedWrapper>).isExtended) {\n    return (internalFn as GetAvailablePathForAttachmentsExtendedFn)(fileName, ext.slice(1), note, true);\n  }\n\n  return await getAvailablePathForAttachments(app, fileName, ext.slice(1), note, true);\n}\n\n/**\n * Retrieves the available path for attachments.\n * @param app - The Obsidian application instance.\n * @param filename - Name of the file.\n * @param extension - Extension of the file.\n * @param file - The file to attach to.\n * @param skipFolderCreation - Should folder creation be skipped?\n * @returns A promise that resolves to the available path for attachments.\n */\nexport async function getAvailablePathForAttachments(app: App, filename: string, extension: string, file: TFile | null, skipFolderCreation: boolean): Promise<string> {\n  let attachmentFolderPath = app.vault.getConfig('attachmentFolderPath') as string;\n  const isCurrentFolder = attachmentFolderPath === '.' || attachmentFolderPath === './';\n  let relativePath = null;\n\n  if (attachmentFolderPath.startsWith('./')) {\n    relativePath = trimStart(attachmentFolderPath, './');\n  }\n\n  if (isCurrentFolder) {\n    attachmentFolderPath = file ? file.parent?.path ?? '' : '';\n  } else if (relativePath) {\n    attachmentFolderPath = (file ? file.parent?.getParentPrefix() ?? '' : '') + relativePath;\n  }\n\n  attachmentFolderPath = normalize(normalizeSlashes(attachmentFolderPath));\n  filename = normalize(normalizeSlashes(filename));\n\n  let folder = getFolderOrNull(app, attachmentFolderPath, true);\n\n  if (!folder && relativePath) {\n    if (!skipFolderCreation) {\n      folder = await app.vault.createFolder(attachmentFolderPath);\n    } else {\n      folder = createTFolderInstance(app.vault, attachmentFolderPath);\n    }\n  }\n\n  const prefix = folder?.getParentPrefix() ?? '';\n  return app.vault.getAvailablePath(prefix + filename, extension);\n}\n\n/**\n * Normalizes a path by combining multiple slashes into a single slash and removing leading and trailing slashes.\n * @param path - Path to normalize.\n * @returns The normalized path.\n */\nfunction normalizeSlashes(path: string): string {\n  path = path.replace(/([\\\\/])+/g, '/');\n  path = path.replace(/(^\\/+|\\/+$)/g, '');\n  return path || '/';\n}\n"],
  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAeA,6BAIO;AAEP,kBAGO;AACP,oBAGO;AAEP,wBAGO;AAjCP,IAAI,oBAAoB,WAAW,iBAAiB,MAAM,MAAI;AAAC,MAAG,OAAO,eAAa,UAAS;AAAC,WAAO,IAAI,IAAI,OAAO,SAAS,IAAI;AAAA,EAAC;AAAC,SAAO,QAAQ,UAAU,EAAE,cAAc,UAAU;AAAC,GAAG;AAC5L,IAAI,YAAY,WAAW,SAAS,KAAK;AAAA,EACvC,OAAO,MAAI;AAAA,EACX,OAAO,CAAC;AAAA,EACR,YAAY;AACd;AAqCA,eAAsB,wBAAwB,KAAU,gBAA6C;AACnG,aAAO,yCAAiB,MAAM,sBAAsB,KAAK,kBAAkB,cAAc,CAAC;AAC5F;AAyBA,eAAsB,sBAAsB,KAAU,sBAAkC,gBAA6C;AACnI,QAAM,qBAAiB,2BAAQ,oBAAoB;AACnD,QAAM,eAAW,2BAAQ,cAAc;AACvC,QAAM,WAAO,4CAAoB,IAAI,OAAO,QAAQ;AACpD,QAAM,UAAM,qBAAQ,cAAc;AAClC,QAAM,eAAW,sBAAS,gBAAgB,GAAG;AAG7C,QAAM,aAAa,IAAI,MAAM;AAC7B,MAAK,WAAwC,YAAY;AACvD,WAAQ,WAAwD,UAAU,IAAI,MAAM,CAAC,GAAG,MAAM,IAAI;AAAA,EACpG;AAEA,SAAO,MAAM,+BAA+B,KAAK,UAAU,IAAI,MAAM,CAAC,GAAG,MAAM,IAAI;AACrF;AAWA,eAAsB,+BAA+B,KAAU,UAAkB,WAAmB,MAAoB,oBAA8C;AACpK,MAAI,uBAAuB,IAAI,MAAM,UAAU,sBAAsB;AACrE,QAAM,kBAAkB,yBAAyB,OAAO,yBAAyB;AACjF,MAAI,eAAe;AAEnB,MAAI,qBAAqB,WAAW,IAAI,GAAG;AACzC,uBAAe,yBAAU,sBAAsB,IAAI;AAAA,EACrD;AAEA,MAAI,iBAAiB;AACnB,2BAAuB,OAAO,KAAK,QAAQ,QAAQ,KAAK;AAAA,EAC1D,WAAW,cAAc;AACvB,4BAAwB,OAAO,KAAK,QAAQ,gBAAgB,KAAK,KAAK,MAAM;AAAA,EAC9E;AAEA,6BAAuB,yBAAU,iBAAiB,oBAAoB,CAAC;AACvE,iBAAW,yBAAU,iBAAiB,QAAQ,CAAC;AAE/C,MAAI,aAAS,mCAAgB,KAAK,sBAAsB,IAAI;AAE5D,MAAI,CAAC,UAAU,cAAc;AAC3B,QAAI,CAAC,oBAAoB;AACvB,eAAS,MAAM,IAAI,MAAM,aAAa,oBAAoB;AAAA,IAC5D,OAAO;AACL,mBAAS,8CAAsB,IAAI,OAAO,oBAAoB;AAAA,IAChE;AAAA,EACF;AAEA,QAAM,SAAS,QAAQ,gBAAgB,KAAK;AAC5C,SAAO,IAAI,MAAM,iBAAiB,SAAS,UAAU,SAAS;AAChE;AAOA,SAAS,iBAAiB,MAAsB;AAC9C,SAAO,KAAK,QAAQ,aAAa,GAAG;AACpC,SAAO,KAAK,QAAQ,gBAAgB,EAAE;AACtC,SAAO,QAAQ;AACjB;",
  "names": []
}

@@ -2,7 +2,7 @@
2
2
  * @packageDocumentation AttachmentPath
3
3
  * Provides utility functions for working with attachment paths.
4
4
  */
5
- import type { App, TAbstractFile } from 'obsidian';
5
+ import type { App, TFile } from 'obsidian';
6
6
  import type { PathOrFile } from './FileSystem.ts';
7
7
  /**
8
8
  * Retrieves the attachment folder path for a given note.
@@ -24,7 +24,7 @@ export interface ExtendedWrapper {
24
24
  /**
25
25
  * Get available path for attachments function.
26
26
  */
27
- export type GetAvailablePathForAttachmentsExtendedFn = (filename: string, extension: string, file: TAbstractFile | null, skipFolderCreation?: boolean) => Promise<string>;
27
+ export type GetAvailablePathForAttachmentsExtendedFn = (filename: string, extension: string, file: TFile | null, skipFolderCreation?: boolean) => Promise<string>;
28
28
  /**
29
29
  * Retrieves the file path for an attachment within a note.
30
30
  *
@@ -43,4 +43,4 @@ export declare function getAttachmentFilePath(app: App, attachmentPathOrFile: Pa
43
43
  * @param skipFolderCreation - Should folder creation be skipped?
44
44
  * @returns A promise that resolves to the available path for attachments.
45
45
  */
46
- export declare function getAvailablePathForAttachments(app: App, filename: string, extension: string, file: TAbstractFile | null, skipFolderCreation: boolean): Promise<string>;
46
+ export declare function getAvailablePathForAttachments(app: App, filename: string, extension: string, file: TFile | null, skipFolderCreation: boolean): Promise<string>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "obsidian-dev-utils",
3
- "version": "3.28.1",
3
+ "version": "3.28.2",
4
4
  "description": "This is the collection of useful functions that you can use for your Obsidian plugin development",
5
5
  "main": "./dist/lib/index.cjs",
6
6
  "types": "./dist/lib/index.d.ts",