@pgpmjs/core 6.31.0 → 6.32.0

package/core/class/pgpm.d.ts

@@ -137,10 +137,35 @@ export declare class PgpmPackage {
     private createSqlFiles;
     publishToDist(distFolder?: string): void;
     /**
-      * Installs an extension npm package into the local skitch extensions directory,
-      * and automatically adds it to the current module’s package.json dependencies.
+      * Installs an extension npm package into the workspace extensions directory.
+      *
+      * When run inside a module, the installed version is recorded in the
+      * module's package.json dependencies and its .control requires list.
+      * When run at the workspace root, the installed version is recorded in
+      * the workspace pgpm.json `dependencies` field instead — no .control
+      * file is needed.
       */
     installModules(...pkgstrs: string[]): Promise<void>;
+    /**
+     * Returns the workspace-level pgpm module dependencies recorded in
+     * the workspace pgpm.json `dependencies` field.
+     */
+    getWorkspaceDependencies(): Record<string, string>;
+    /**
+     * Records installed module versions into the workspace pgpm.json
+     * `dependencies` field. No-op when the workspace uses pgpm.config.js.
+     */
+    recordWorkspaceDependencies(versions: Record<string, string>): void;
+    /**
+     * Installs the workspace-level dependencies declared in pgpm.json into
+     * the workspace extensions/ directory. Skips modules already present
+     * unless `force` is set.
+     *
+     * @returns The list of installed package specs (name@version)
+     */
+    installWorkspaceDependencies(options?: {
+        force?: boolean;
+    }): Promise<string[]>;
     /**
      * Returns information about which of the specified modules are installed.
      * Checks the module's package.json dependencies to determine installation status.

package/core/class/pgpm.js

@@ -236,7 +236,15 @@ class PgpmPackage {
     listModules() {
         if (!this.workspacePath)
             return {};
-        const moduleFiles = glob.sync(`${this.workspacePath}/**/*.control`).filter((file) => !/node_modules/.test(file)).sort((a, b) => a.localeCompare(b));
+        // Workspace membership is first-class: modules are discovered from the
+        // workspace's declared `packages` globs plus the installed extensions/
+        // directory — never from an unscoped workspace-wide scan. This keeps
+        // nested workspaces (e.g. test fixtures) out of the module map.
+        const packageDirs = [
+            ...this.allowedDirs,
+            ...glob.sync(path_1.default.join(this.workspacePath, EXTENSIONS_DIR, '{*,@*/*}'))
+        ];
+        const moduleFiles = [...new Set(packageDirs.flatMap(dir => glob.sync(`${dir}/**/*.control`)))].filter((file) => !/node_modules/.test(file)).sort((a, b) => a.localeCompare(b));
         // Group files by module name to handle collisions
         const filesByName = new Map();
         moduleFiles.forEach((file) => {
@@ -790,21 +798,31 @@ ${dependencies.length > 0 ? dependencies.map(dep => `-- requires: ${dep}`).join(
         }
     }
     /**
-      * Installs an extension npm package into the local skitch extensions directory,
-      * and automatically adds it to the current module’s package.json dependencies.
+      * Installs an extension npm package into the workspace extensions directory.
+      *
+      * When run inside a module, the installed version is recorded in the
+      * module's package.json dependencies and its .control requires list.
+      * When run at the workspace root, the installed version is recorded in
+      * the workspace pgpm.json `dependencies` field instead — no .control
+      * file is needed.
       */
     async installModules(...pkgstrs) {
         this.ensureWorkspace();
-        this.ensureModule();
+        const inModule = this.isInModule();
         const originalDir = process.cwd();
         const skitchExtDir = path_1.default.join(this.workspacePath, EXTENSIONS_DIR);
-        const pkgJsonPath = path_1.default.join(this.modulePath, 'package.json');
-        if (!fs_1.default.existsSync(pkgJsonPath)) {
-            throw new Error(`No package.json found at module path: ${this.modulePath}`);
+        let pkgJsonPath;
+        let pkgData;
+        if (inModule) {
+            pkgJsonPath = path_1.default.join(this.modulePath, 'package.json');
+            if (!fs_1.default.existsSync(pkgJsonPath)) {
+                throw new Error(`No package.json found at module path: ${this.modulePath}`);
+            }
+            pkgData = JSON.parse(fs_1.default.readFileSync(pkgJsonPath, 'utf-8'));
+            pkgData.dependencies = pkgData.dependencies || {};
         }
-        const pkgData = JSON.parse(fs_1.default.readFileSync(pkgJsonPath, 'utf-8'));
-        pkgData.dependencies = pkgData.dependencies || {};
         const newlyAdded = [];
+        const installedVersions = {};
         for (const pkgstr of pkgstrs) {
             const { name } = (0, parse_package_name_1.parse)(pkgstr);
             const tempDir = fs_1.default.mkdtempSync(path_1.default.join(os_1.default.tmpdir(), 'pgpm-install-'));
@@ -837,7 +855,10 @@ ${dependencies.length > 0 ? dependencies.map(dep => `-- requires: ${dep}`).join(
                         throw new Error(`Missing package.json in installed extension: ${dst}`);
                     }
                     const { version } = JSON.parse(fs_1.default.readFileSync(pkgJsonFile, 'utf-8'));
-                    pkgData.dependencies[name] = `${version}`;
+                    installedVersions[name] = `${version}`;
+                    if (pkgData) {
+                        pkgData.dependencies[name] = `${version}`;
+                    }
                     const extensionName = (0, files_2.getExtensionName)(dst);
                     newlyAdded.push(extensionName);
                 }
@@ -847,20 +868,80 @@ ${dependencies.length > 0 ? dependencies.map(dep => `-- requires: ${dep}`).join(
                 process.chdir(originalDir);
             }
         }
-        const { dependencies, devDependencies, ...rest } = pkgData;
-        const finalPkgData = { ...rest };
-        if (dependencies) {
-            finalPkgData.dependencies = sortObjectByKey(dependencies);
+        if (inModule && pkgData && pkgJsonPath) {
+            const { dependencies, devDependencies, ...rest } = pkgData;
+            const finalPkgData = { ...rest };
+            if (dependencies) {
+                finalPkgData.dependencies = sortObjectByKey(dependencies);
+            }
+            if (devDependencies) {
+                finalPkgData.devDependencies = sortObjectByKey(devDependencies);
+            }
+            fs_1.default.writeFileSync(pkgJsonPath, JSON.stringify(finalPkgData, null, 2));
+            logger.success(`📦 Updated package.json with: ${pkgstrs.join(', ')}`);
+            // ─── Update .control file with actual extension names ──────────────
+            const currentDeps = this.getRequiredModules();
+            const updatedDeps = Array.from(new Set([...currentDeps, ...newlyAdded])).sort();
+            (0, files_2.writeExtensions)(this.modulePath, updatedDeps);
+        }
+        else {
+            this.recordWorkspaceDependencies(installedVersions);
+        }
+    }
+    /**
+     * Returns the workspace-level pgpm module dependencies recorded in
+     * the workspace pgpm.json `dependencies` field.
+     */
+    getWorkspaceDependencies() {
+        this.ensureWorkspace();
+        const configPath = path_1.default.join(this.workspacePath, 'pgpm.json');
+        if (!fs_1.default.existsSync(configPath)) {
+            return {};
+        }
+        const config = JSON.parse(fs_1.default.readFileSync(configPath, 'utf-8'));
+        return config.dependencies || {};
+    }
+    /**
+     * Records installed module versions into the workspace pgpm.json
+     * `dependencies` field. No-op when the workspace uses pgpm.config.js.
+     */
+    recordWorkspaceDependencies(versions) {
+        this.ensureWorkspace();
+        if (Object.keys(versions).length === 0)
+            return;
+        const configPath = path_1.default.join(this.workspacePath, 'pgpm.json');
+        if (!fs_1.default.existsSync(configPath)) {
+            logger.warn('No pgpm.json found at workspace root — skipping dependency recording.');
+            return;
         }
-        if (devDependencies) {
-            finalPkgData.devDependencies = sortObjectByKey(devDependencies);
+        const config = JSON.parse(fs_1.default.readFileSync(configPath, 'utf-8'));
+        config.dependencies = sortObjectByKey({
+            ...(config.dependencies || {}),
+            ...versions
+        });
+        fs_1.default.writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n');
+        logger.success(`📦 Updated pgpm.json dependencies with: ${Object.keys(versions).join(', ')}`);
+    }
+    /**
+     * Installs the workspace-level dependencies declared in pgpm.json into
+     * the workspace extensions/ directory. Skips modules already present
+     * unless `force` is set.
+     *
+     * @returns The list of installed package specs (name@version)
+     */
+    async installWorkspaceDependencies(options) {
+        this.ensureWorkspace();
+        const { force = false } = options || {};
+        const dependencies = this.getWorkspaceDependencies();
+        const installedModules = this.getWorkspaceInstalledModules();
+        const toInstall = Object.entries(dependencies)
+            .filter(([name]) => force || !installedModules.includes(name))
+            .map(([name, version]) => `${name}@${version}`);
+        if (toInstall.length === 0) {
+            return [];
         }
-        fs_1.default.writeFileSync(pkgJsonPath, JSON.stringify(finalPkgData, null, 2));
-        logger.success(`📦 Updated package.json with: ${pkgstrs.join(', ')}`);
-        // ─── Update .control file with actual extension names ──────────────
-        const currentDeps = this.getRequiredModules();
-        const updatedDeps = Array.from(new Set([...currentDeps, ...newlyAdded])).sort();
-        (0, files_2.writeExtensions)(this.modulePath, updatedDeps);
+        await this.installModules(...toInstall);
+        return toInstall;
     }
     /**
      * Returns information about which of the specified modules are installed.

package/esm/core/class/pgpm.js

@@ -197,7 +197,15 @@ export class PgpmPackage {
     listModules() {
         if (!this.workspacePath)
             return {};
-        const moduleFiles = glob.sync(`${this.workspacePath}/**/*.control`).filter((file) => !/node_modules/.test(file)).sort((a, b) => a.localeCompare(b));
+        // Workspace membership is first-class: modules are discovered from the
+        // workspace's declared `packages` globs plus the installed extensions/
+        // directory — never from an unscoped workspace-wide scan. This keeps
+        // nested workspaces (e.g. test fixtures) out of the module map.
+        const packageDirs = [
+            ...this.allowedDirs,
+            ...glob.sync(path.join(this.workspacePath, EXTENSIONS_DIR, '{*,@*/*}'))
+        ];
+        const moduleFiles = [...new Set(packageDirs.flatMap(dir => glob.sync(`${dir}/**/*.control`)))].filter((file) => !/node_modules/.test(file)).sort((a, b) => a.localeCompare(b));
         // Group files by module name to handle collisions
         const filesByName = new Map();
         moduleFiles.forEach((file) => {
@@ -751,21 +759,31 @@ ${dependencies.length > 0 ? dependencies.map(dep => `-- requires: ${dep}`).join(
         }
     }
     /**
-      * Installs an extension npm package into the local skitch extensions directory,
-      * and automatically adds it to the current module’s package.json dependencies.
+      * Installs an extension npm package into the workspace extensions directory.
+      *
+      * When run inside a module, the installed version is recorded in the
+      * module's package.json dependencies and its .control requires list.
+      * When run at the workspace root, the installed version is recorded in
+      * the workspace pgpm.json `dependencies` field instead — no .control
+      * file is needed.
       */
     async installModules(...pkgstrs) {
         this.ensureWorkspace();
-        this.ensureModule();
+        const inModule = this.isInModule();
         const originalDir = process.cwd();
         const skitchExtDir = path.join(this.workspacePath, EXTENSIONS_DIR);
-        const pkgJsonPath = path.join(this.modulePath, 'package.json');
-        if (!fs.existsSync(pkgJsonPath)) {
-            throw new Error(`No package.json found at module path: ${this.modulePath}`);
+        let pkgJsonPath;
+        let pkgData;
+        if (inModule) {
+            pkgJsonPath = path.join(this.modulePath, 'package.json');
+            if (!fs.existsSync(pkgJsonPath)) {
+                throw new Error(`No package.json found at module path: ${this.modulePath}`);
+            }
+            pkgData = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf-8'));
+            pkgData.dependencies = pkgData.dependencies || {};
         }
-        const pkgData = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf-8'));
-        pkgData.dependencies = pkgData.dependencies || {};
         const newlyAdded = [];
+        const installedVersions = {};
         for (const pkgstr of pkgstrs) {
             const { name } = parse(pkgstr);
             const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'pgpm-install-'));
@@ -798,7 +816,10 @@ ${dependencies.length > 0 ? dependencies.map(dep => `-- requires: ${dep}`).join(
                         throw new Error(`Missing package.json in installed extension: ${dst}`);
                     }
                     const { version } = JSON.parse(fs.readFileSync(pkgJsonFile, 'utf-8'));
-                    pkgData.dependencies[name] = `${version}`;
+                    installedVersions[name] = `${version}`;
+                    if (pkgData) {
+                        pkgData.dependencies[name] = `${version}`;
+                    }
                     const extensionName = getExtensionName(dst);
                     newlyAdded.push(extensionName);
                 }
@@ -808,20 +829,80 @@ ${dependencies.length > 0 ? dependencies.map(dep => `-- requires: ${dep}`).join(
                 process.chdir(originalDir);
             }
         }
-        const { dependencies, devDependencies, ...rest } = pkgData;
-        const finalPkgData = { ...rest };
-        if (dependencies) {
-            finalPkgData.dependencies = sortObjectByKey(dependencies);
+        if (inModule && pkgData && pkgJsonPath) {
+            const { dependencies, devDependencies, ...rest } = pkgData;
+            const finalPkgData = { ...rest };
+            if (dependencies) {
+                finalPkgData.dependencies = sortObjectByKey(dependencies);
+            }
+            if (devDependencies) {
+                finalPkgData.devDependencies = sortObjectByKey(devDependencies);
+            }
+            fs.writeFileSync(pkgJsonPath, JSON.stringify(finalPkgData, null, 2));
+            logger.success(`📦 Updated package.json with: ${pkgstrs.join(', ')}`);
+            // ─── Update .control file with actual extension names ──────────────
+            const currentDeps = this.getRequiredModules();
+            const updatedDeps = Array.from(new Set([...currentDeps, ...newlyAdded])).sort();
+            writeExtensions(this.modulePath, updatedDeps);
+        }
+        else {
+            this.recordWorkspaceDependencies(installedVersions);
+        }
+    }
+    /**
+     * Returns the workspace-level pgpm module dependencies recorded in
+     * the workspace pgpm.json `dependencies` field.
+     */
+    getWorkspaceDependencies() {
+        this.ensureWorkspace();
+        const configPath = path.join(this.workspacePath, 'pgpm.json');
+        if (!fs.existsSync(configPath)) {
+            return {};
+        }
+        const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+        return config.dependencies || {};
+    }
+    /**
+     * Records installed module versions into the workspace pgpm.json
+     * `dependencies` field. No-op when the workspace uses pgpm.config.js.
+     */
+    recordWorkspaceDependencies(versions) {
+        this.ensureWorkspace();
+        if (Object.keys(versions).length === 0)
+            return;
+        const configPath = path.join(this.workspacePath, 'pgpm.json');
+        if (!fs.existsSync(configPath)) {
+            logger.warn('No pgpm.json found at workspace root — skipping dependency recording.');
+            return;
         }
-        if (devDependencies) {
-            finalPkgData.devDependencies = sortObjectByKey(devDependencies);
+        const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+        config.dependencies = sortObjectByKey({
+            ...(config.dependencies || {}),
+            ...versions
+        });
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n');
+        logger.success(`📦 Updated pgpm.json dependencies with: ${Object.keys(versions).join(', ')}`);
+    }
+    /**
+     * Installs the workspace-level dependencies declared in pgpm.json into
+     * the workspace extensions/ directory. Skips modules already present
+     * unless `force` is set.
+     *
+     * @returns The list of installed package specs (name@version)
+     */
+    async installWorkspaceDependencies(options) {
+        this.ensureWorkspace();
+        const { force = false } = options || {};
+        const dependencies = this.getWorkspaceDependencies();
+        const installedModules = this.getWorkspaceInstalledModules();
+        const toInstall = Object.entries(dependencies)
+            .filter(([name]) => force || !installedModules.includes(name))
+            .map(([name, version]) => `${name}@${version}`);
+        if (toInstall.length === 0) {
+            return [];
         }
-        fs.writeFileSync(pkgJsonPath, JSON.stringify(finalPkgData, null, 2));
-        logger.success(`📦 Updated package.json with: ${pkgstrs.join(', ')}`);
-        // ─── Update .control file with actual extension names ──────────────
-        const currentDeps = this.getRequiredModules();
-        const updatedDeps = Array.from(new Set([...currentDeps, ...newlyAdded])).sort();
-        writeExtensions(this.modulePath, updatedDeps);
+        await this.installModules(...toInstall);
+        return toInstall;
     }
     /**
      * Returns information about which of the specified modules are installed.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/core",
-  "version": "6.31.0",
+  "version": "6.32.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "PGPM Package and Migration Tools",
   "main": "index.js",
@@ -48,21 +48,21 @@
     "makage": "^0.3.0"
   },
   "dependencies": {
-    "@pgpmjs/env": "^2.28.0",
+    "@pgpmjs/env": "^2.28.1",
     "@pgpmjs/logger": "^2.14.0",
-    "@pgpmjs/server-utils": "^3.15.1",
-    "@pgpmjs/types": "^2.34.0",
+    "@pgpmjs/server-utils": "^3.15.2",
+    "@pgpmjs/types": "^2.35.0",
     "csv-to-pg": "^3.21.0",
     "genomic": "^5.6.2",
     "glob": "^13.0.6",
     "minimatch": "^10.2.5",
     "parse-package-name": "^1.0.0",
     "pg": "^8.21.0",
-    "pg-cache": "^3.15.0",
+    "pg-cache": "^3.15.1",
     "pg-env": "^1.18.0",
     "pgsql-deparser": "^17.18.3",
     "pgsql-parser": "^17.9.15",
     "yanse": "^0.2.1"
   },
-  "gitHead": "ff6c442b789cbe8803f33036110f6e09124e65df"
+  "gitHead": "dd2accb683fe20c7278a0d58fd36a04a3b07ac63"
 }