@open-audio-stack/core 0.1.27 → 0.1.29

package/build/classes/ManagerLocal.d.ts

@@ -12,8 +12,8 @@ export declare class ManagerLocal extends Manager {
     install(slug: string, version?: string): Promise<void | PackageVersion>;
     installAll(): Promise<Package[]>;
     installDependency(slug: string, version?: string, filePath?: string, type?: RegistryType): Promise<any>;
-    installDependencies(filePath?: string, type?: RegistryType): Promise<any>;
-    open(filePath?: string): void;
+    installDependencies(filePath: string, type?: RegistryType): Promise<any>;
+    open(filePath: string): void;
     uninstall(slug: string, version?: string): Promise<void | PackageVersion>;
     uninstallDependency(slug: string, version?: string, filePath?: string, type?: RegistryType): Promise<any>;
     uninstallDependencies(filePath?: string, type?: RegistryType): Promise<any>;

package/build/classes/ManagerLocal.js

@@ -114,11 +114,13 @@ export class ManagerLocal extends Manager {
     scan(ext = 'json', installable = true) {
         const filePaths = dirRead(path.join(this.typeDir, '**', `index.${ext}`));
         filePaths.forEach((filePath) => {
-            let subPath = filePath.replace(`${this.typeDir}` + path.sep, '');
+            let subPath = filePath.replace(`${this.typeDir}${path.sep}`, '');
             // TODO improve this code.
-            const parts = subPath.split(path.sep);
-            parts.shift();
-            subPath = parts.join(path.sep);
+            if (this.type === RegistryType.Plugins || this.type === RegistryType.Presets) {
+                const parts = subPath.split(path.sep);
+                parts.shift();
+                subPath = parts.join(path.sep);
+            }
             const pkgJson = ext === 'yaml' ? fileReadYaml(filePath) : fileReadJson(filePath);
             if (installable)
                 pkgJson.installed = true;
@@ -350,7 +352,7 @@ export class ManagerLocal extends Manager {
                 dirDelete(orgDir);
         });
         delete pkgVersion.installed;
-        return this.getPackage(slug)?.getVersion(versionNum);
+        return pkgVersion;
     }
     async uninstallDependency(slug, version, filePath, type = RegistryType.Plugins) {
         // Get local package file.

package/build/helpers/file.d.ts

@@ -1,3 +1,4 @@
+import { GlobOptionsWithFileTypesFalse } from 'glob';
 import { PackageInterface } from '../types/Package.js';
 import { PluginFile } from '../types/Plugin.js';
 import { PresetFile } from '../types/Preset.js';
@@ -18,7 +19,7 @@ export declare function dirPackage(pkg: PackageInterface): string;
 export declare function dirPlugins(): string;
 export declare function dirPresets(): string;
 export declare function dirProjects(): string;
-export declare function dirRead(dir: string, options?: any): string[];
+export declare function dirRead(dir: string, options?: GlobOptionsWithFileTypesFalse): string[];
 export declare function dirRename(dir: string, dirNew: string): void | boolean;
 export declare function fileCreate(filePath: string, data: string | Buffer): void;
 export declare function fileCreateJson(filePath: string, data: object): void;

package/build/helpers/file.js

@@ -127,7 +127,19 @@ export function dirRead(dir, options) {
     if (getSystem() === SystemType.Win) {
         dir = dir.replace(/\\/g, '/');
     }
-    return globSync(dir, options);
+    // Ignore Mac files in Contents folders
+    // Filter out any paths not starting with the base directory
+    // This is to prevent issues with symlinks.
+    const baseDir = dir.includes('*') ? dir.split('*')[0] : dir;
+    const allPaths = globSync(dir, {
+        ignore: [`${baseDir}/**/*.{app,component,lv2,vst,vst3}/**/*`],
+        realpath: true,
+        ...options,
+    });
+    // Glob input paths use forward slashes.
+    // Glob output paths are system-specific.
+    const baseDirCrossPlatform = baseDir.split('/').join(path.sep);
+    return allPaths.filter(p => p.startsWith(baseDirCrossPlatform));
 }
 export function dirRename(dir, dirNew) {
     if (dirExists(dir)) {
@@ -208,9 +220,7 @@ export function fileMove(filePath, newPath) {
 }
 export function filesMove(dirSource, dirTarget, dirSub, formatDir) {
     // Read files from source directory, ignoring Mac Contents files.
-    const files = dirRead(`${dirSource}/**/*.*`, {
-        ignore: [`${dirSource}/**/Contents/**/*`],
-    });
+    const files = dirRead(`${dirSource}/**/*.*`);
     const filesMoved = [];
     // For each file, move to correct folder based on type
     files.forEach((fileSource) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-audio-stack/core",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "description": "Open-source audio plugin management software",
   "type": "module",
   "main": "./build/index.js",