@pgpmjs/core 4.5.0 → 4.5.2

package/esm/export/export-migrations.js

@@ -6,6 +6,7 @@ import { getPgPool } from 'pg-cache';
 import { PgpmPackage } from '../core/class/pgpm';
 import { writePgpmFiles, writePgpmPlan } from '../files';
 import { getMissingInstallableModules } from '../modules/modules';
+import { parseAuthor } from '../utils/author';
 import { exportMeta } from './export-meta';
 /**
  * Required extensions for database schema exports.
@@ -244,6 +245,7 @@ const preparePackage = async ({ project, author, outdir, name, description, exte
     process.chdir(pgpmDir);
     const plan = glob(path.join(pgpmDir, 'pgpm.plan'));
     if (!plan.length) {
+        const { fullName, email } = parseAuthor(author);
         await project.initModule({
             name,
             description,
@@ -253,7 +255,9 @@ const preparePackage = async ({ project, author, outdir, name, description, exte
                 moduleName: name,
                 moduleDesc: description,
                 access: 'restricted',
-                license: 'CLOSED'
+                license: 'CLOSED',
+                fullName,
+                ...(email && { email })
             }
         });
     }

package/esm/files/plan/writer.js

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import path from 'path';
+import { parseAuthor } from '../../utils/author';
 /**
  * Write a PGPM plan file based on the provided rows
  */
@@ -7,22 +8,9 @@ export function writePgpmPlan(rows, opts) {
     const dir = path.resolve(path.join(opts.outdir, opts.name));
     fs.mkdirSync(dir, { recursive: true });
     const date = () => '2017-08-11T08:11:51Z'; // stubbed timestamp
-    // Parse author string - it might contain email in format "Name <email>"
-    const authorInput = (opts.author || 'constructive').trim();
-    let authorName = authorInput;
-    let authorEmail = '';
-    // Check if author already contains email in <...> format
-    const emailMatch = authorInput.match(/^(.+?)\s*<([^>]+)>\s*$/);
-    if (emailMatch) {
-        // Author already has email format: "Name <email>"
-        authorName = emailMatch[1].trim();
-        authorEmail = emailMatch[2].trim();
-    }
-    else {
-        // No email in author, use default format
-        authorName = authorInput;
-        authorEmail = `${authorName}@5b0c196eeb62`;
-    }
+    const { fullName, email } = parseAuthor(opts.author || 'constructive');
+    const authorName = fullName;
+    const authorEmail = email || `${fullName}@5b0c196eeb62`;
     const duplicates = {};
     const plan = opts.replacer(`%syntax-version=1.0.0
 %project=constructive-extension-name

package/esm/packaging/package.js

@@ -24,7 +24,7 @@ const filterStatements = (stmts, extension) => {
             !stmt.hasOwnProperty('CreateExtensionStmt');
     });
 };
-export const packageModule = async (packageDir, { usePlan = true, extension = true, pretty = true, functionDelimiter = '$EOFCODE$' } = {}) => {
+export const packageModule = async (packageDir, { usePlan = true, extension = true, pretty = true, functionDelimiter = '$EOFCODE$', outputDiff = false } = {}) => {
     const resolveFn = usePlan ? resolveWithPlan : resolve;
     const sql = resolveFn(packageDir);
     if (!sql?.trim()) {
@@ -43,7 +43,8 @@ export const packageModule = async (packageDir, { usePlan = true, extension = tr
             functionDelimiter
         });
         const tree1 = parsed.stmts;
-        const tree2 = await parse(finalSql);
+        const reparsed = await parse(finalSql);
+        const tree2 = filterStatements(reparsed.stmts, extension);
         const results = {
             sql: `${topLine}${finalSql}`,
         };
@@ -61,7 +62,7 @@ export const packageModule = async (packageDir, { usePlan = true, extension = tr
         throw e;
     }
 };
-export const writePackage = async ({ version, extension = true, usePlan = true, packageDir, }) => {
+export const writePackage = async ({ version, extension = true, usePlan = true, packageDir, outputDiff = false, }) => {
     const pkgPath = `${packageDir}/package.json`;
     const pkg = require(pkgPath);
     const extname = await getExtensionName(packageDir);
@@ -73,6 +74,7 @@ export const writePackage = async ({ version, extension = true, usePlan = true,
     const { sql, diff, tree1, tree2 } = await packageModule(packageDir, {
         extension,
         usePlan,
+        outputDiff,
     });
     const outPath = extension ? `${packageDir}/sql` : `${packageDir}/out`;
     rmSync(outPath, { recursive: true, force: true });
@@ -85,10 +87,14 @@ export const writePackage = async ({ version, extension = true, usePlan = true,
         writeFileSync(makePath, Makefile.replace(regex, sqlFileName));
     }
     if (diff) {
-        log.warn(`⚠️ SQL diff exists! Review the ${relative(packageDir, outPath)}/ folder.`);
-        // Uncomment if needed:
-        // writeFileSync(`${outPath}/orig.${sqlFileName}.tree.json`, tree1);
-        // writeFileSync(`${outPath}/parsed.${sqlFileName}.tree.json`, tree2);
+        if (outputDiff) {
+            writeFileSync(`${outPath}/orig.${sqlFileName}.tree.json`, tree1);
+            writeFileSync(`${outPath}/parsed.${sqlFileName}.tree.json`, tree2);
+            log.warn(`⚠️ AST round-trip diff detected! Diff files written to ${relative(packageDir, outPath)}/`);
+        }
+        else {
+            log.warn(`⚠️ AST round-trip diff detected! Run with --outputDiff to export the AST diff files.`);
+        }
     }
     const writePath = `${outPath}/${sqlFileName}`;
     writeFileSync(writePath, sql);

package/esm/utils/author.js

@@ -0,0 +1,11 @@
+export function parseAuthor(author) {
+    const trimmed = (author || '').trim();
+    const match = trimmed.match(/^(.+?)\s*<([^>]+)>$/);
+    if (match) {
+        return {
+            fullName: match[1].trim(),
+            email: match[2].trim()
+        };
+    }
+    return { fullName: trimmed };
+}

package/export/export-migrations.js

@@ -12,6 +12,7 @@ const pg_cache_1 = require("pg-cache");
 const pgpm_1 = require("../core/class/pgpm");
 const files_1 = require("../files");
 const modules_1 = require("../modules/modules");
+const author_1 = require("../utils/author");
 const export_meta_1 = require("./export-meta");
 /**
  * Required extensions for database schema exports.
@@ -251,6 +252,7 @@ const preparePackage = async ({ project, author, outdir, name, description, exte
     process.chdir(pgpmDir);
     const plan = (0, glob_1.sync)(path_1.default.join(pgpmDir, 'pgpm.plan'));
     if (!plan.length) {
+        const { fullName, email } = (0, author_1.parseAuthor)(author);
         await project.initModule({
             name,
             description,
@@ -260,7 +262,9 @@ const preparePackage = async ({ project, author, outdir, name, description, exte
                 moduleName: name,
                 moduleDesc: description,
                 access: 'restricted',
-                license: 'CLOSED'
+                license: 'CLOSED',
+                fullName,
+                ...(email && { email })
             }
         });
     }

package/files/plan/writer.js

@@ -11,6 +11,7 @@ exports.generateChangeLineContent = generateChangeLineContent;
 exports.generateTagLineContent = generateTagLineContent;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const author_1 = require("../../utils/author");
 /**
  * Write a PGPM plan file based on the provided rows
  */
@@ -18,22 +19,9 @@ function writePgpmPlan(rows, opts) {
     const dir = path_1.default.resolve(path_1.default.join(opts.outdir, opts.name));
     fs_1.default.mkdirSync(dir, { recursive: true });
     const date = () => '2017-08-11T08:11:51Z'; // stubbed timestamp
-    // Parse author string - it might contain email in format "Name <email>"
-    const authorInput = (opts.author || 'constructive').trim();
-    let authorName = authorInput;
-    let authorEmail = '';
-    // Check if author already contains email in <...> format
-    const emailMatch = authorInput.match(/^(.+?)\s*<([^>]+)>\s*$/);
-    if (emailMatch) {
-        // Author already has email format: "Name <email>"
-        authorName = emailMatch[1].trim();
-        authorEmail = emailMatch[2].trim();
-    }
-    else {
-        // No email in author, use default format
-        authorName = authorInput;
-        authorEmail = `${authorName}@5b0c196eeb62`;
-    }
+    const { fullName, email } = (0, author_1.parseAuthor)(opts.author || 'constructive');
+    const authorName = fullName;
+    const authorEmail = email || `${fullName}@5b0c196eeb62`;
     const duplicates = {};
     const plan = opts.replacer(`%syntax-version=1.0.0
 %project=constructive-extension-name

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/core",
-  "version": "4.5.0",
+  "version": "4.5.2",
   "author": "Constructive <developers@constructive.io>",
   "description": "PGPM Package and Migration Tools",
   "main": "index.js",
@@ -64,5 +64,5 @@
     "pgsql-parser": "^17.9.5",
     "yanse": "^0.1.8"
   },
-  "gitHead": "09721f934b339bd8c55d2e633abaded6d20b0f65"
+  "gitHead": "3768b497b5b65410a23bcf7e01ed4192a5f1dd95"
 }

package/packaging/package.d.ts

@@ -4,16 +4,17 @@ interface PackageModuleOptions {
     extension?: boolean;
     pretty?: boolean;
     functionDelimiter?: string;
+    outputDiff?: boolean;
 }
 interface WritePackageOptions extends PackageModuleOptions {
     version: string;
     packageDir: string;
 }
-export declare const packageModule: (packageDir: string, { usePlan, extension, pretty, functionDelimiter }?: PackageModuleOptions) => Promise<{
+export declare const packageModule: (packageDir: string, { usePlan, extension, pretty, functionDelimiter, outputDiff }?: PackageModuleOptions) => Promise<{
     sql: string;
     diff?: boolean;
     tree1?: string;
     tree2?: string;
 }>;
-export declare const writePackage: ({ version, extension, usePlan, packageDir, }: WritePackageOptions) => Promise<void>;
+export declare const writePackage: ({ version, extension, usePlan, packageDir, outputDiff, }: WritePackageOptions) => Promise<void>;
 export {};

package/packaging/package.js

@@ -28,7 +28,7 @@ const filterStatements = (stmts, extension) => {
             !stmt.hasOwnProperty('CreateExtensionStmt');
     });
 };
-const packageModule = async (packageDir, { usePlan = true, extension = true, pretty = true, functionDelimiter = '$EOFCODE$' } = {}) => {
+const packageModule = async (packageDir, { usePlan = true, extension = true, pretty = true, functionDelimiter = '$EOFCODE$', outputDiff = false } = {}) => {
     const resolveFn = usePlan ? resolve_1.resolveWithPlan : resolve_1.resolve;
     const sql = resolveFn(packageDir);
     if (!sql?.trim()) {
@@ -47,7 +47,8 @@ const packageModule = async (packageDir, { usePlan = true, extension = true, pre
             functionDelimiter
         });
         const tree1 = parsed.stmts;
-        const tree2 = await (0, pgsql_parser_1.parse)(finalSql);
+        const reparsed = await (0, pgsql_parser_1.parse)(finalSql);
+        const tree2 = filterStatements(reparsed.stmts, extension);
         const results = {
             sql: `${topLine}${finalSql}`,
         };
@@ -66,7 +67,7 @@ const packageModule = async (packageDir, { usePlan = true, extension = true, pre
     }
 };
 exports.packageModule = packageModule;
-const writePackage = async ({ version, extension = true, usePlan = true, packageDir, }) => {
+const writePackage = async ({ version, extension = true, usePlan = true, packageDir, outputDiff = false, }) => {
     const pkgPath = `${packageDir}/package.json`;
     const pkg = require(pkgPath);
     const extname = await (0, files_1.getExtensionName)(packageDir);
@@ -78,6 +79,7 @@ const writePackage = async ({ version, extension = true, usePlan = true, package
     const { sql, diff, tree1, tree2 } = await (0, exports.packageModule)(packageDir, {
         extension,
         usePlan,
+        outputDiff,
     });
     const outPath = extension ? `${packageDir}/sql` : `${packageDir}/out`;
     (0, fs_1.rmSync)(outPath, { recursive: true, force: true });
@@ -90,10 +92,14 @@ const writePackage = async ({ version, extension = true, usePlan = true, package
         (0, fs_1.writeFileSync)(makePath, Makefile.replace(regex, sqlFileName));
     }
     if (diff) {
-        log.warn(`⚠️ SQL diff exists! Review the ${(0, path_1.relative)(packageDir, outPath)}/ folder.`);
-        // Uncomment if needed:
-        // writeFileSync(`${outPath}/orig.${sqlFileName}.tree.json`, tree1);
-        // writeFileSync(`${outPath}/parsed.${sqlFileName}.tree.json`, tree2);
+        if (outputDiff) {
+            (0, fs_1.writeFileSync)(`${outPath}/orig.${sqlFileName}.tree.json`, tree1);
+            (0, fs_1.writeFileSync)(`${outPath}/parsed.${sqlFileName}.tree.json`, tree2);
+            log.warn(`⚠️ AST round-trip diff detected! Diff files written to ${(0, path_1.relative)(packageDir, outPath)}/`);
+        }
+        else {
+            log.warn(`⚠️ AST round-trip diff detected! Run with --outputDiff to export the AST diff files.`);
+        }
     }
     const writePath = `${outPath}/${sqlFileName}`;
     (0, fs_1.writeFileSync)(writePath, sql);

package/utils/author.d.ts

@@ -0,0 +1,5 @@
+export interface ParsedAuthor {
+    fullName: string;
+    email?: string;
+}
+export declare function parseAuthor(author: string): ParsedAuthor;

package/utils/author.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseAuthor = parseAuthor;
+function parseAuthor(author) {
+    const trimmed = (author || '').trim();
+    const match = trimmed.match(/^(.+?)\s*<([^>]+)>$/);
+    if (match) {
+        return {
+            fullName: match[1].trim(),
+            email: match[2].trim()
+        };
+    }
+    return { fullName: trimmed };
+}