@pgpmjs/core 6.29.0 → 6.29.1

package/core/class/pgpm.js

@@ -133,7 +133,7 @@ class PgpmPackage {
         const dirs = globs.flatMap(pattern => glob.sync(path_1.default.join(this.workspacePath, pattern)));
         const resolvedDirs = dirs.map(dir => path_1.default.resolve(dir));
         // Remove duplicates by converting to Set and back to array
-        return [...new Set(resolvedDirs)];
+        return [...new Set(resolvedDirs.sort((a, b) => a.localeCompare(b)))];
     }
     loadAllowedParentDirs() {
         const globs = this.config?.packages ?? [];
@@ -236,7 +236,7 @@ class PgpmPackage {
     listModules() {
         if (!this.workspacePath)
             return {};
-        const moduleFiles = glob.sync(`${this.workspacePath}/**/*.control`).filter((file) => !/node_modules/.test(file));
+        const moduleFiles = glob.sync(`${this.workspacePath}/**/*.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) => {

package/esm/core/class/pgpm.js

@@ -94,7 +94,7 @@ export class PgpmPackage {
         const dirs = globs.flatMap(pattern => glob.sync(path.join(this.workspacePath, pattern)));
         const resolvedDirs = dirs.map(dir => path.resolve(dir));
         // Remove duplicates by converting to Set and back to array
-        return [...new Set(resolvedDirs)];
+        return [...new Set(resolvedDirs.sort((a, b) => a.localeCompare(b)))];
     }
     loadAllowedParentDirs() {
         const globs = this.config?.packages ?? [];
@@ -197,7 +197,7 @@ export class PgpmPackage {
     listModules() {
         if (!this.workspacePath)
             return {};
-        const moduleFiles = glob.sync(`${this.workspacePath}/**/*.control`).filter((file) => !/node_modules/.test(file));
+        const moduleFiles = glob.sync(`${this.workspacePath}/**/*.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) => {

package/esm/resolution/deps.js

@@ -17,7 +17,6 @@ import { errors } from '@pgpmjs/types';
 function createDependencyResolver(deps, external, options) {
     const { handleExternalDep, transformModule, makeKey = (module) => module, extname } = options;
     return function dep_resolve(sqlmodule, resolved, unresolved) {
-        unresolved.push(sqlmodule);
         let moduleToResolve = sqlmodule;
         let edges;
         let returnEarly = false;
@@ -30,6 +29,12 @@ function createDependencyResolver(deps, external, options) {
         else {
             edges = deps[makeKey(sqlmodule)];
         }
+        // Avoid re-resolving a module already resolved; moduleToResolve may differ
+        // from sqlmodule when project-prefixed or tag-resolved references are normalized.
+        if (resolved.includes(moduleToResolve)) {
+            return;
+        }
+        unresolved.push(sqlmodule);
         // Handle external dependencies if no edges found
         if (!edges) {
             if (handleExternalDep) {
@@ -325,7 +330,7 @@ export const resolveDependencies = (packageDir, extname, options = {}) => {
     const deps = {};
     const tagMappings = {};
     // Process SQL files and build dependency graph
-    const files = glob(`${packageDir}/deploy/**/*.sql`);
+    const files = glob(`${packageDir}/deploy/**/*.sql`).sort((a, b) => a.localeCompare(b));
     for (const file of files) {
         const data = readFileSync(file, 'utf-8');
         const lines = data.split('\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/core",
-  "version": "6.29.0",
+  "version": "6.29.1",
   "author": "Constructive <developers@constructive.io>",
   "description": "PGPM Package and Migration Tools",
   "main": "index.js",
@@ -64,5 +64,5 @@
     "pgsql-parser": "^17.9.15",
     "yanse": "^0.2.1"
   },
-  "gitHead": "7eb34a3baa10ba3476575967b87ff51b606e042a"
+  "gitHead": "6235bf0645f56d423fa464404ec1e3283c49e532"
 }

package/resolution/deps.js

@@ -20,7 +20,6 @@ const types_1 = require("@pgpmjs/types");
 function createDependencyResolver(deps, external, options) {
     const { handleExternalDep, transformModule, makeKey = (module) => module, extname } = options;
     return function dep_resolve(sqlmodule, resolved, unresolved) {
-        unresolved.push(sqlmodule);
         let moduleToResolve = sqlmodule;
         let edges;
         let returnEarly = false;
@@ -33,6 +32,12 @@ function createDependencyResolver(deps, external, options) {
         else {
             edges = deps[makeKey(sqlmodule)];
         }
+        // Avoid re-resolving a module already resolved; moduleToResolve may differ
+        // from sqlmodule when project-prefixed or tag-resolved references are normalized.
+        if (resolved.includes(moduleToResolve)) {
+            return;
+        }
+        unresolved.push(sqlmodule);
         // Handle external dependencies if no edges found
         if (!edges) {
             if (handleExternalDep) {
@@ -329,7 +334,7 @@ const resolveDependencies = (packageDir, extname, options = {}) => {
     const deps = {};
     const tagMappings = {};
     // Process SQL files and build dependency graph
-    const files = (0, glob_1.sync)(`${packageDir}/deploy/**/*.sql`);
+    const files = (0, glob_1.sync)(`${packageDir}/deploy/**/*.sql`).sort((a, b) => a.localeCompare(b));
     for (const file of files) {
         const data = (0, fs_1.readFileSync)(file, 'utf-8');
         const lines = data.split('\n');