pgpm 0.4.1 → 0.4.3

package/commands/update.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const find_and_require_package_json_1 = require("find-and-require-package-json");
 const logger_1 = require("@launchql/logger");
 const child_process_1 = require("child_process");
-const package_1 = require("../package");
 const npm_version_1 = require("../utils/npm-version");
 const cli_error_1 = require("../utils/cli-error");
 const log = new logger_1.Logger('update');
@@ -42,7 +42,7 @@ exports.default = async (argv, _prompter, _options) => {
         console.log(updateUsageText);
         process.exit(0);
     }
-    const pkgJson = (0, package_1.readAndParsePackageJson)();
+    const pkgJson = (0, find_and_require_package_json_1.findAndRequirePackageJson)(__dirname);
     const pkgName = argv.package || pkgJson.name || 'pgpm';
     const registry = argv.registry;
     const dryRun = Boolean(argv['dry-run']);

package/commands.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commands = exports.createPgpmCommandMap = void 0;
+const find_and_require_package_json_1 = require("find-and-require-package-json");
 const pg_cache_1 = require("pg-cache");
 const add_1 = __importDefault(require("./commands/add"));
 const admin_users_1 = __importDefault(require("./commands/admin-users"));
@@ -27,7 +28,6 @@ const rename_1 = __importDefault(require("./commands/rename"));
 const revert_1 = __importDefault(require("./commands/revert"));
 const tag_1 = __importDefault(require("./commands/tag"));
 const verify_1 = __importDefault(require("./commands/verify"));
-const package_2 = require("./package");
 const utils_1 = require("./utils");
 const cli_error_1 = require("./utils/cli-error");
 const update_check_1 = require("./utils/update-check");
@@ -71,7 +71,7 @@ const createPgpmCommandMap = (skipPgTeardown = false) => {
 exports.createPgpmCommandMap = createPgpmCommandMap;
 const commands = async (argv, prompter, options) => {
     if (argv.version || argv.v) {
-        const pkg = (0, package_2.readAndParsePackageJson)();
+        const pkg = (0, find_and_require_package_json_1.findAndRequirePackageJson)(__dirname);
         console.log(pkg.version);
         process.exit(0);
     }
@@ -99,7 +99,7 @@ const commands = async (argv, prompter, options) => {
     try {
         await (0, update_check_1.checkForUpdates)({
             command,
-            pkgVersion: (0, package_2.readAndParsePackageJson)().version
+            pkgVersion: (0, find_and_require_package_json_1.findAndRequirePackageJson)(__dirname).version
         });
     }
     catch {

package/esm/commands/update.js

@@ -1,6 +1,6 @@
+import { findAndRequirePackageJson } from 'find-and-require-package-json';
 import { Logger } from '@launchql/logger';
 import { spawn } from 'child_process';
-import { readAndParsePackageJson } from '../package';
 import { fetchLatestVersion } from '../utils/npm-version';
 import { cliExitWithError } from '../utils/cli-error';
 const log = new Logger('update');
@@ -40,7 +40,7 @@ export default async (argv, _prompter, _options) => {
         console.log(updateUsageText);
         process.exit(0);
     }
-    const pkgJson = readAndParsePackageJson();
+    const pkgJson = findAndRequirePackageJson(__dirname);
     const pkgName = argv.package || pkgJson.name || 'pgpm';
     const registry = argv.registry;
     const dryRun = Boolean(argv['dry-run']);

package/esm/commands.js

@@ -1,3 +1,4 @@
+import { findAndRequirePackageJson } from 'find-and-require-package-json';
 import { teardownPgPools } from 'pg-cache';
 import add from './commands/add';
 import adminUsers from './commands/admin-users';
@@ -21,7 +22,6 @@ import renameCmd from './commands/rename';
 import revert from './commands/revert';
 import tag from './commands/tag';
 import verify from './commands/verify';
-import { readAndParsePackageJson } from './package';
 import { extractFirst, usageText } from './utils';
 import { cliExitWithError } from './utils/cli-error';
 import { checkForUpdates } from './utils/update-check';
@@ -64,7 +64,7 @@ export const createPgpmCommandMap = (skipPgTeardown = false) => {
 };
 export const commands = async (argv, prompter, options) => {
     if (argv.version || argv.v) {
-        const pkg = readAndParsePackageJson();
+        const pkg = findAndRequirePackageJson(__dirname);
         console.log(pkg.version);
         process.exit(0);
     }
@@ -92,7 +92,7 @@ export const commands = async (argv, prompter, options) => {
     try {
         await checkForUpdates({
             command,
-            pkgVersion: readAndParsePackageJson().version
+            pkgVersion: findAndRequirePackageJson(__dirname).version
         });
     }
     catch {

package/esm/utils/display.js

@@ -1,8 +1,8 @@
+import { findAndRequirePackageJson } from 'find-and-require-package-json';
 import yanse from 'yanse';
-import { readAndParsePackageJson } from '../package';
 // Function to display the version information
 export function displayVersion() {
-    const pkg = readAndParsePackageJson();
+    const pkg = findAndRequirePackageJson(__dirname);
     console.log(yanse.green(`Name: ${pkg.name}`));
     console.log(yanse.blue(`Version: ${pkg.version}`));
 }

package/esm/utils/update-check.js

@@ -1,6 +1,6 @@
+import { findAndRequirePackageJson } from 'find-and-require-package-json';
 import { Logger } from '@launchql/logger';
 import { UPDATE_CHECK_APPSTASH_KEY, UPDATE_CHECK_TTL_MS, UPDATE_PACKAGE_NAME } from '@launchql/types';
-import { readAndParsePackageJson } from '../package';
 import { compareVersions, fetchLatestVersion } from './npm-version';
 import { readUpdateConfig, shouldCheck, writeUpdateConfig } from './update-config';
 const log = new Logger('update-check');
@@ -14,7 +14,7 @@ const shouldSkip = (command) => {
     return false;
 };
 export async function checkForUpdates(options = {}) {
-    const { pkgName = UPDATE_PACKAGE_NAME, pkgVersion = readAndParsePackageJson().version, command, now = Date.now(), key = UPDATE_CHECK_APPSTASH_KEY, toolName, baseDir } = options;
+    const { pkgName = UPDATE_PACKAGE_NAME, pkgVersion = findAndRequirePackageJson(__dirname).version, command, now = Date.now(), key = UPDATE_CHECK_APPSTASH_KEY, toolName, baseDir } = options;
     if (shouldSkip(command)) {
         return null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgpm",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL Package Manager - Database migration and package management CLI",
   "main": "index.js",
@@ -36,25 +36,26 @@
     "@types/js-yaml": "^4.0.9",
     "@types/minimist": "^1.2.5",
     "@types/node": "^20.12.7",
-    "@types/pg": "^8.15.2",
+    "@types/pg": "^8.16.0",
     "@types/semver": "^7.5.8",
     "@types/shelljs": "^0.8.16",
     "glob": "^13.0.0",
     "makage": "^0.1.8",
-    "pg": "^8.16.0",
+    "pg": "^8.16.3",
     "ts-node": "^10.9.2"
   },
   "dependencies": {
-    "@launchql/core": "^2.18.1",
+    "@launchql/core": "^2.18.3",
     "@launchql/env": "^2.6.1",
     "@launchql/logger": "^1.2.1",
     "@launchql/types": "^2.10.1",
     "appstash": "^0.2.4",
-    "create-gen-app": "^0.3.1",
-    "inquirerer": "^2.1.8",
+    "create-gen-app": "^0.3.3",
+    "find-and-require-package-json": "^0.8.0",
+    "inquirerer": "^2.1.11",
     "js-yaml": "^4.1.0",
     "minimist": "^1.2.8",
-    "pg-cache": "^1.5.1",
+    "pg-cache": "^1.5.2",
     "pg-env": "^1.2.1",
     "semver": "^7.6.2",
     "shelljs": "^0.10.0",
@@ -72,5 +73,5 @@
     "pg",
     "pgsql"
   ],
-  "gitHead": "3bfa1e2c4524664d19ebfa2baf214403821bdee9"
+  "gitHead": "d20ccff8c779259574a23e93abbae51234695db5"
 }

package/utils/display.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.usageText = void 0;
 exports.displayVersion = displayVersion;
 exports.displayUsage = displayUsage;
+const find_and_require_package_json_1 = require("find-and-require-package-json");
 const yanse_1 = __importDefault(require("yanse"));
-const package_1 = require("../package");
 // Function to display the version information
 function displayVersion() {
-    const pkg = (0, package_1.readAndParsePackageJson)();
+    const pkg = (0, find_and_require_package_json_1.findAndRequirePackageJson)(__dirname);
     console.log(yanse_1.default.green(`Name: ${pkg.name}`));
     console.log(yanse_1.default.blue(`Version: ${pkg.version}`));
 }

package/utils/update-check.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkForUpdates = checkForUpdates;
+const find_and_require_package_json_1 = require("find-and-require-package-json");
 const logger_1 = require("@launchql/logger");
 const types_1 = require("@launchql/types");
-const package_1 = require("../package");
 const npm_version_1 = require("./npm-version");
 const update_config_1 = require("./update-config");
 const log = new logger_1.Logger('update-check');
@@ -17,7 +17,7 @@ const shouldSkip = (command) => {
     return false;
 };
 async function checkForUpdates(options = {}) {
-    const { pkgName = types_1.UPDATE_PACKAGE_NAME, pkgVersion = (0, package_1.readAndParsePackageJson)().version, command, now = Date.now(), key = types_1.UPDATE_CHECK_APPSTASH_KEY, toolName, baseDir } = options;
+    const { pkgName = types_1.UPDATE_PACKAGE_NAME, pkgVersion = (0, find_and_require_package_json_1.findAndRequirePackageJson)(__dirname).version, command, now = Date.now(), key = types_1.UPDATE_CHECK_APPSTASH_KEY, toolName, baseDir } = options;
     if (shouldSkip(command)) {
         return null;
     }

package/esm/package.js

@@ -1,26 +0,0 @@
-import { existsSync, readFileSync } from 'fs';
-import { dirname, join } from 'path';
-// need to search due to the dist/ folder and src/, etc.
-function findPackageJson(currentDir) {
-    const filePath = join(currentDir, 'package.json');
-    // Check if package.json exists in the current directory
-    if (existsSync(filePath)) {
-        return filePath;
-    }
-    // Get the parent directory
-    const parentDir = dirname(currentDir);
-    // If reached the root directory, package.json is not found
-    if (parentDir === currentDir) {
-        throw new Error('package.json not found in any parent directory');
-    }
-    // Recursively look in the parent directory
-    return findPackageJson(parentDir);
-}
-export function readAndParsePackageJson() {
-    // Start searching from the current directory
-    const pkgPath = findPackageJson(__dirname);
-    // Read and parse the package.json
-    const str = readFileSync(pkgPath, 'utf8');
-    const pkg = JSON.parse(str);
-    return pkg;
-}

package/package.d.ts

@@ -1 +0,0 @@
-export declare function readAndParsePackageJson(): any;

package/package.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readAndParsePackageJson = readAndParsePackageJson;
-const fs_1 = require("fs");
-const path_1 = require("path");
-// need to search due to the dist/ folder and src/, etc.
-function findPackageJson(currentDir) {
-    const filePath = (0, path_1.join)(currentDir, 'package.json');
-    // Check if package.json exists in the current directory
-    if ((0, fs_1.existsSync)(filePath)) {
-        return filePath;
-    }
-    // Get the parent directory
-    const parentDir = (0, path_1.dirname)(currentDir);
-    // If reached the root directory, package.json is not found
-    if (parentDir === currentDir) {
-        throw new Error('package.json not found in any parent directory');
-    }
-    // Recursively look in the parent directory
-    return findPackageJson(parentDir);
-}
-function readAndParsePackageJson() {
-    // Start searching from the current directory
-    const pkgPath = findPackageJson(__dirname);
-    // Read and parse the package.json
-    const str = (0, fs_1.readFileSync)(pkgPath, 'utf8');
-    const pkg = JSON.parse(str);
-    return pkg;
-}