@prisma-psm/core 1.0.5 → 1.0.7

package/src/launcher/commands/deploy.ts

@@ -1,15 +1,22 @@
 import {CommandModule} from "yargs";
-import {DeployOptions} from "../../tools/deploy";
+import { DeployOptions, deploy} from "../../tools/deploy";
 
 
 const command:CommandModule<DeployOptions, DeployOptions> = {
-    command: "migrate deploy",
-    describe: "Deploy to production environment",
+    command: "deploy",
+    describe: "Deploy all commited revision into server",
     builder: args => {
+        args.options( "schema", {
+            type: "string",
+            alias: "s"
+        })
         return args;
     },
     handler:( argv) =>{
-        console.log( "TODO - psm migrate deploy ainda não esta implementado")
+        deploy( argv ).then( value => {
+        }).catch( reason => {
+            console.error( reason );
+        })
     }
 }
 

package/src/launcher/commands/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,OAAO,CAAC;AAIpC,QAAA,MAAM,OAAO,EAAC,aAUb,CAAA;AAED,SAAS,OAAO,CAAC"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,OAAO,CAAC;AAIpC,QAAA,MAAM,OAAO,EAAC,aASb,CAAA;AAED,SAAS,OAAO,CAAC"}

package/src/launcher/commands/generate.js

@@ -1,7 +1,7 @@
 "use strict";
 const generate_1 = require("../../tools/generate");
 const command = {
-    command: "migrate generate",
+    command: "generate",
     describe: "Generate pre-migrate archives",
     builder: args => {
         return args;

package/src/launcher/commands/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["generate.ts"],"names":[],"mappings":";AACA,mDAA8C;AAG9C,MAAM,OAAO,GAAiB;IAC1B,OAAO,EAAE,kBAAkB;IAC3B,QAAQ,EAAE,+BAA+B;IAEzC,OAAO,EAAE,IAAI,CAAC,EAAE;QACZ,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,EAAE,IAAI,CAAC,EAAE;QACZ,IAAA,mBAAQ,GAAE,CAAC;IACf,CAAC;CACJ,CAAA;AAED,iBAAS,OAAO,CAAC"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["generate.ts"],"names":[],"mappings":";AACA,mDAA8C;AAG9C,MAAM,OAAO,GAAiB;IAC1B,OAAO,EAAE,UAAU;IACnB,QAAQ,EAAE,+BAA+B;IACzC,OAAO,EAAE,IAAI,CAAC,EAAE;QACZ,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,OAAO,EAAE,IAAI,CAAC,EAAE;QACZ,IAAA,mBAAQ,GAAE,CAAA;IACd,CAAC;CACJ,CAAA;AAED,iBAAS,OAAO,CAAC"}

package/src/launcher/commands/generate.ts

@@ -3,14 +3,13 @@ import {generate} from "../../tools/generate";
 
 
 const command:CommandModule = {
-    command: "migrate generate",
+    command: "generate",
     describe: "Generate pre-migrate archives",
-
     builder: args => {
         return args;
     },
     handler: args => {
-        generate();
+        generate()
     }
 }
 

package/src/launcher/index.js

@@ -1,16 +1,38 @@
 #!/usr/bin/env node
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 require("source-map-support").install();
-const path_1 = __importDefault(require("path"));
-require("source-map-support").install();
+const Path = __importStar(require("node:path"));
 const yargs_1 = __importDefault(require("yargs"));
 let ss = (0, yargs_1.default)(process.argv.slice(2))
     //language=file-reference
-    .commandDir(path_1.default.join(__dirname, "./commands"))
+    .commandDir(Path.join(__dirname, "./commands"))
     .demandCommand()
     .help()
     .argv;

package/src/launcher/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,EAAE,CAAC;AAExC,gDAAwB;AAExB,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,EAAE,CAAC;AACxC,kDAA0B;AAE1B,IAAI,EAAE,GAAG,IAAA,eAAK,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjC,yBAAyB;KACxB,UAAU,CAAC,cAAI,CAAC,IAAI,CAAE,SAAS,EAAE,YAAY,CAAE,CAAE;KACjD,aAAa,EAAE;KACf,IAAI,EAAE;KACN,IAAI,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,CAAC,oBAAoB,CAAC,CAAC,OAAO,EAAE,CAAC;AACxC,gDAAkC;AAClC,kDAA0B;AAE1B,IAAI,EAAE,GAAG,IAAA,eAAK,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjC,yBAAyB;KACxB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAE,SAAS,EAAE,YAAY,CAAE,CAAE;KACjD,aAAa,EAAE;KACf,IAAI,EAAE;KACN,IAAI,CAAC"}

package/src/launcher/index.ts

@@ -1,9 +1,6 @@
 #!/usr/bin/env node
 require("source-map-support").install();
-
-import Path from "path";
-
-require("source-map-support").install();
+import * as Path from "node:path";
 import yargs from "yargs";
 
 let ss = yargs(process.argv.slice(2))

package/src/tools/{migrate.d.ts → commit.d.ts}

@@ -4,5 +4,5 @@ export interface MigrateOptions {
     label?: string;
     "generate-command": string;
 }
-export declare function migrate(opts: MigrateOptions): Promise<void>;
-//# sourceMappingURL=migrate.d.ts.map
+export declare function commit(opts: MigrateOptions): Promise<void>;
+//# sourceMappingURL=commit.d.ts.map

package/src/tools/commit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commit.d.ts","sourceRoot":"","sources":["commit.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,cAAc;IAC3B,MAAM,CAAC,EAAC,MAAM,CAAA;IACd,QAAQ,CAAC,EAAC,MAAM,CAAA;IAChB,KAAK,CAAC,EAAC,MAAM,CAAA;IACb,kBAAkB,EAAC,MAAM,CAAA;CAC5B;AACD,wBAAsB,MAAM,CAAC,IAAI,EAAC,cAAc,iBA+F/C"}

package/src/tools/{migrate.js → commit.js}

@@ -31,20 +31,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrate = migrate;
+exports.commit = commit;
 const fs = __importStar(require("node:fs"));
-const yaml = __importStar(require("yaml"));
 const Path = __importStar(require("node:path"));
+const yaml = __importStar(require("yaml"));
 const node_child_process_1 = require("node:child_process");
-const prisma = [
-    `${process.cwd()}/schema.prisma`,
-    `${process.cwd()}/prisma/schema.prisma`,
-];
-function migrate(opts) {
+const deploy_1 = require("./deploy");
+const chalk_1 = __importDefault(require("chalk"));
+const common_1 = require("./common");
+function commit(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         require('dotenv').config();
-        console.log(opts);
         if (opts.generate) {
             let command = opts["generate-command"];
             if (!command)
@@ -53,44 +54,48 @@ function migrate(opts) {
                 cwd: process.cwd()
             });
         }
-        let schema = opts.schema;
-        if (!schema) {
-            schema = prisma.find(value => {
-                return fs.existsSync(value);
-            });
-        }
-        if (!schema) {
-            return console.error("Migrate error: schema.prisma file not found!");
-        }
-        console.log(`PSM migrate base do schema ${schema}`);
-        const home = Path.dirname(schema);
-        const psm_yml = Path.join(home, "psm.yml");
-        if (!fs.existsSync(psm_yml)) {
-            return console.error("Migrate error: psm.yml file not found!");
-        }
-        console.log(`PSM migrate using ${psm_yml}`);
-        const psm = yaml.parse(fs.readFileSync(psm_yml).toString());
+        const { psm, psm_sql, driver, home } = yield (0, common_1.psmLockup)({ schema: opts.schema });
         const next = Path.join(psm.psm.output, "next/migration.next.sql");
         const check = Path.join(psm.psm.output, "next/migration.next.check.sql");
         if (!fs.existsSync(check)) {
-            return console.error("Migrate error: next/migration.next.check.sql file not found!");
+            throw new Error("Migrate error: next/migration.next.check.sql file not found!");
         }
         if (!fs.existsSync(next)) {
-            return console.error("Migrate error: next/migration.next.sql file not found!");
+            throw new Error("Migrate error: next/migration.next.sql file not found!");
         }
-        const driver = yield Promise.resolve(`${psm.psm.driver}`).then(s => __importStar(require(s)));
         const migrator = driver.migrator({
             url: process.env[psm.psm.url],
             migrate: fs.readFileSync(next).toString(),
             check: fs.readFileSync(check).toString(),
+            core: fs.readFileSync(psm_sql).toString(),
         });
-        let result = yield migrator.test();
+        let result = yield migrator.core();
         if (!result.success) {
             console.error(result.error);
             result.messages.forEach(error => {
                 console.error(error);
             });
-            return console.error("Migrate error: Check shadow failed!");
+            throw new Error("Migrate error: Core failed!");
+        }
+        const fetchResponse = yield (0, deploy_1.fetch)({
+            psm: psm,
+            driver: driver,
+            home: home
+        });
+        if (fetchResponse.error) {
+            throw fetchResponse.error;
+        }
+        const noPulled = fetchResponse.revs.filter(n => !n.pulled);
+        if (noPulled.length) {
+            throw new Error(`Commit not pulled already exists! Please run ${chalk_1.default.bold("psm deploy")} first!`);
+        }
+        result = yield migrator.test();
+        if (!result.success) {
+            console.error(result.error);
+            result.messages.forEach(error => {
+                console.error(error);
+            });
+            throw new Error("Migrate error: Check shadow failed!");
         }
         result = yield migrator.migrate();
         if (!result.success) {
@@ -98,15 +103,21 @@ function migrate(opts) {
             result.messages.forEach(error => {
                 console.error(error);
             });
-            return console.error("Migrate error: Check shadow failed!");
+            throw new Error("Migrate error: Commit migration failed!");
         }
         const moment = require('moment');
         let label = "";
         if (!!opts.label)
             label = ` - ${sanitizeLabel(opts.label)}`;
+        let preview;
+        const last = getLatestFolder(Path.join(home, `psm/revisions/schema`));
+        if (!!last) {
+            preview = yaml.parse(fs.readFileSync(Path.join(home, "psm/revisions/schema", last, "psm.yml")).toString());
+        }
         psm.migration = {
+            revision: `${moment().format('YYYYMMDDHHmmss')} - ${psm.psm.migration}`,
             instate: moment().format('YYYYMMDDHHmmss'),
-            preview: getLatestFolder(Path.join(home, `psm/revisions/schema`)),
+            preview: preview === null || preview === void 0 ? void 0 : preview.migration.revision,
             label: opts.label
         };
         const nextRev = Path.join(home, `psm/revisions/schema/${psm.migration.instate}${label}`);
@@ -134,4 +145,4 @@ function sanitizeLabel(label) {
         .trim()
         .replace(/\s+/g, ' '); // normaliza espaços
 }
-//# sourceMappingURL=migrate.js.map
+//# sourceMappingURL=commit.js.map

package/src/tools/commit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commit.js","sourceRoot":"","sources":["commit.ts"],"names":[],"mappings":"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"}

package/src/tools/{migrate.ts → commit.ts}

@@ -1,15 +1,12 @@
 import * as fs from "node:fs";
-import * as yaml from "yaml";
 import * as Path from "node:path";
+import * as yaml from "yaml";
 import {PSMConfigFile} from "../configs";
-import {PSMDriver} from "../driver";
 import { spawnSync } from "node:child_process";
-import moment from "moment/moment";
+import {fetch} from "./deploy";
+import chalk from "chalk";
+import {psmLockup} from "./common";
 
-const prisma = [
-    `${process.cwd()}/schema.prisma`,
-    `${process.cwd()}/prisma/schema.prisma`,
-];
 
 export interface MigrateOptions {
     schema?:string
@@ -17,9 +14,8 @@ export interface MigrateOptions {
     label?:string
     "generate-command":string
 }
-export async function migrate( opts:MigrateOptions ) {
+export async function commit(opts:MigrateOptions ) {
     require('dotenv').config();
-    console.log( opts )
     if( opts.generate ) {
         let command = opts["generate-command"];
         if( !command) command = "prisma generate"
@@ -27,68 +23,83 @@ export async function migrate( opts:MigrateOptions ) {
             cwd: process.cwd()
         });
     }
-    let schema = opts.schema;
-    if( !schema ) {
-        schema = prisma.find( value => {
-            return fs.existsSync( value );
-        })
-    }
-    if( !schema ) {
-        return console.error( "Migrate error: schema.prisma file not found!" );
-    }
-
-    console.log(`PSM migrate base do schema ${schema}`);
-
-    const home = Path.dirname( schema );
-    const psm_yml = Path.join( home, "psm.yml" );
-    if( !fs.existsSync( psm_yml ) ) {
-        return console.error( "Migrate error: psm.yml file not found!" );
-    }
 
-    console.log(`PSM migrate using ${psm_yml}`);
-    const psm = yaml.parse( fs.readFileSync( psm_yml ).toString() ) as PSMConfigFile;
+    const { psm, psm_sql, driver, home } = await psmLockup({ schema: opts.schema });
     const next = Path.join( psm.psm.output, "next/migration.next.sql");
     const check = Path.join( psm.psm.output, "next/migration.next.check.sql");
 
     if( !fs.existsSync( check) ) {
-        return console.error( "Migrate error: next/migration.next.check.sql file not found!" );
+        throw new Error( "Migrate error: next/migration.next.check.sql file not found!" );
     }
     if( !fs.existsSync( next) ) {
-        return console.error(  "Migrate error: next/migration.next.sql file not found!" );
+        throw new Error(  "Migrate error: next/migration.next.sql file not found!" );
     }
 
 
-    const driver = await import( psm.psm.driver ) as PSMDriver;
     const migrator = driver.migrator({
-        url: process.env[psm.psm.url],
+        url: process.env[ psm.psm.url ],
         migrate: fs.readFileSync( next ).toString(),
         check: fs.readFileSync( check ).toString(),
+        core: fs.readFileSync( psm_sql ).toString(),
+    });
+
+    let result = await migrator.core();
+    if( !result.success ) {
+        console.error( result.error );
+        result.messages.forEach( error => {
+            console.error( error );
+        });
+        throw new Error( "Migrate error: Core failed!" );
+    }
+
+    const fetchResponse = await fetch({
+        psm: psm,
+        driver: driver,
+        home: home
     });
 
-    let result = await migrator.test();
+    if( fetchResponse.error ) {
+        throw fetchResponse.error;
+    }
+
+    const noPulled = fetchResponse.revs.filter( n=> !n.pulled );
+
+
+    if( noPulled.length ) {
+        throw new Error( `Commit not pulled already exists! Please run ${chalk.bold("psm deploy")} first!` );
+    }
+
+    result = await migrator.test();
     if( !result.success ) {
         console.error( result.error );
         result.messages.forEach( error => {
             console.error( error );
         });
-        return console.error( "Migrate error: Check shadow failed!" );
+        throw new Error( "Migrate error: Check shadow failed!" );
     }
 
+
     result = await migrator.migrate();
     if( !result.success ) {
         console.error( result.error );
         result.messages.forEach( error => {
             console.error( error );
         });
-        return console.error( "Migrate error: Check shadow failed!" );
+        throw new Error( "Migrate error: Commit migration failed!" );
     }
 
     const moment = require('moment');
     let label = "";
-    if( !!opts.label ) label = ` - ${sanitizeLabel( opts.label )}`
+    if( !!opts.label ) label = ` - ${sanitizeLabel( opts.label )}`;
+    let preview:PSMConfigFile;
+    const last = getLatestFolder( Path.join( home, `psm/revisions/schema`));
+    if( !!last ){
+        preview = yaml.parse( fs.readFileSync( Path.join( home, "psm/revisions/schema", last, "psm.yml")).toString() ) as  PSMConfigFile;
+    }
     psm.migration = {
+        revision: `${ moment().format( 'YYYYMMDDHHmmss' ) } - ${psm.psm.migration}`,
         instate: moment().format( 'YYYYMMDDHHmmss' ),
-        preview: getLatestFolder( Path.join( home, `psm/revisions/schema`)),
+        preview: preview?.migration.revision,
         label: opts.label
     }
     const nextRev = Path.join( home, `psm/revisions/schema/${psm.migration.instate}${label}`);

package/src/tools/common.d.ts

@@ -0,0 +1,14 @@
+import { PSMConfigFile } from "../configs";
+import { PSMDriver } from "../driver";
+export interface CommonSchema {
+    schema: string;
+}
+export declare function psmLockup(opts: CommonSchema): Promise<{
+    schema: string;
+    psm_yml: string;
+    psm_sql: string;
+    psm: PSMConfigFile;
+    driver: PSMDriver;
+    home: string;
+}>;
+//# sourceMappingURL=common.d.ts.map

package/src/tools/common.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["common.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AASpC,MAAM,WAAW,YAAY;IACzB,MAAM,EAAC,MAAM,CAAA;CAChB;AACD,wBAAsB,SAAS,CAAE,IAAI,EAAC,YAAY;;;;;;;GA6BjD"}

package/src/tools/common.js

@@ -0,0 +1,70 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.psmLockup = psmLockup;
+const fs = __importStar(require("node:fs"));
+const Path = __importStar(require("node:path"));
+const yaml = __importStar(require("yaml"));
+const prisma = [
+    `${process.cwd()}/schema.prisma`,
+    `${process.cwd()}/prisma/schema.prisma`,
+];
+function psmLockup(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let schema = opts.schema;
+        if (!schema) {
+            schema = prisma.find(value => {
+                return fs.existsSync(value);
+            });
+        }
+        if (!schema) {
+            throw new Error("Migrate error: schema.prisma file not found!");
+        }
+        console.log(`PSM migrate base do schema ${schema}`);
+        const home = Path.dirname(schema);
+        const psm_yml = Path.join(home, "psm.yml");
+        const psm_sql = Path.join(home, "psm.sql");
+        if (!fs.existsSync(psm_yml)) {
+            throw new Error("Migrate error: psm.yml file not found!");
+        }
+        if (!fs.existsSync(psm_sql)) {
+            throw new Error("Migrate error: psm.sql file not found!");
+        }
+        console.log(`PSM migrate using ${psm_yml}`);
+        const psm = yaml.parse(fs.readFileSync(psm_yml).toString());
+        const driver = yield Promise.resolve(`${psm.psm.driver}`).then(s => __importStar(require(s)));
+        return { schema, psm_yml, psm_sql, psm, driver, home };
+    });
+}
+//# sourceMappingURL=common.js.map

package/src/tools/common.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.js","sourceRoot":"","sources":["common.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgBA,8BA6BC;AA7CD,4CAA8B;AAC9B,gDAAkC;AAClC,2CAA6B;AAK7B,MAAM,MAAM,GAAG;IACX,GAAG,OAAO,CAAC,GAAG,EAAE,gBAAgB;IAChC,GAAG,OAAO,CAAC,GAAG,EAAE,uBAAuB;CAC1C,CAAC;AAMF,SAAsB,SAAS,CAAE,IAAiB;;QAC9C,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,IAAI,CAAC,MAAM,EAAG,CAAC;YACX,MAAM,GAAG,MAAM,CAAC,IAAI,CAAE,KAAK,CAAC,EAAE;gBAC1B,OAAO,EAAE,CAAC,UAAU,CAAE,KAAK,CAAE,CAAC;YAClC,CAAC,CAAC,CAAA;QACN,CAAC;QACD,IAAI,CAAC,MAAM,EAAG,CAAC;YACX,MAAM,IAAI,KAAK,CAAG,8CAA8C,CAAG,CAAA;QACvE,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,8BAA8B,MAAM,EAAE,CAAC,CAAC;QAEpD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAE,MAAM,CAAE,CAAC;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAE,IAAI,EAAE,SAAS,CAAE,CAAC;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAC5C,IAAI,CAAC,EAAE,CAAC,UAAU,CAAE,OAAO,CAAE,EAAG,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAE,wCAAwC,CAAE,CAAC;QAChE,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAE,OAAO,CAAE,EAAG,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAE,wCAAwC,CAAE,CAAC;QAChE,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,qBAAqB,OAAO,EAAE,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAE,EAAE,CAAC,YAAY,CAAE,OAAO,CAAE,CAAC,QAAQ,EAAE,CAAmB,CAAC;QAEjF,MAAM,MAAM,GAAG,yBAAc,GAAG,CAAC,GAAG,CAAC,MAAM,uCAAe,CAAC;QAE3D,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;IAC1D,CAAC;CAAA"}

package/src/tools/common.ts

@@ -0,0 +1,46 @@
+import * as fs from "node:fs";
+import * as Path from "node:path";
+import * as yaml from "yaml";
+import {PSMConfigFile} from "../configs";
+import {PSMDriver} from "../driver";
+
+
+const prisma = [
+    `${process.cwd()}/schema.prisma`,
+    `${process.cwd()}/prisma/schema.prisma`,
+];
+
+
+export interface CommonSchema {
+    schema:string
+}
+export async function psmLockup( opts:CommonSchema ){
+    let schema = opts.schema;
+    if( !schema ) {
+        schema = prisma.find( value => {
+            return fs.existsSync( value );
+        })
+    }
+    if( !schema ) {
+        throw new Error ( "Migrate error: schema.prisma file not found!"  )
+    }
+
+    console.log(`PSM migrate base do schema ${schema}`);
+
+    const home = Path.dirname( schema );
+    const psm_yml = Path.join( home, "psm.yml" );
+    const psm_sql = Path.join( home, "psm.sql");
+    if( !fs.existsSync( psm_yml ) ) {
+        throw new Error( "Migrate error: psm.yml file not found!" );
+    }
+    if( !fs.existsSync( psm_sql ) ) {
+        throw new Error( "Migrate error: psm.sql file not found!" );
+    }
+
+    console.log(`PSM migrate using ${psm_yml}`);
+    const psm = yaml.parse( fs.readFileSync( psm_yml ).toString() ) as PSMConfigFile;
+
+    const driver = await import( psm.psm.driver ) as PSMDriver;
+
+    return { schema, psm_yml, psm_sql, psm, driver, home }
+}

package/src/tools/deploy.d.ts

@@ -1,7 +1,49 @@
+import { PSMConfigFile } from "../configs";
+import { PSMDriver } from "../driver";
 export interface DeployOptions {
     schema?: string;
     generate?: string;
     label?: string;
     "generate-command": string;
 }
+export declare function deploy(opts: DeployOptions): Promise<void>;
+export interface FetchOptions {
+    home: string;
+    driver: PSMDriver;
+    psm: PSMConfigFile;
+}
+export declare function fetch(opts: FetchOptions): Promise<{
+    error: Error;
+    revs: {
+        psm: PSMConfigFile;
+        migrate: string;
+        pulled: boolean;
+        label: string;
+        message: string[];
+        date: Date;
+    }[];
+    hint?: undefined;
+} | {
+    error: Error;
+    hint: any;
+    revs: {
+        psm: PSMConfigFile;
+        migrate: string;
+        pulled: boolean;
+        label: string;
+        message: string[];
+        date: Date;
+    }[];
+} | {
+    revs: {
+        psm: PSMConfigFile;
+        migrate: string;
+        pulled: boolean;
+        label: string;
+        message: string[];
+        date: Date;
+    }[];
+    error?: undefined;
+    hint?: undefined;
+}>;
 //# sourceMappingURL=deploy.d.ts.map

package/src/tools/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["deploy.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC1B,MAAM,CAAC,EAAC,MAAM,CAAA;IACd,QAAQ,CAAC,EAAC,MAAM,CAAA;IAChB,KAAK,CAAC,EAAC,MAAM,CAAA;IACb,kBAAkB,EAAC,MAAM,CAAA;CAC5B"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["deploy.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AAEzC,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AAGpC,MAAM,WAAW,aAAa;IAC1B,MAAM,CAAC,EAAC,MAAM,CAAA;IACd,QAAQ,CAAC,EAAC,MAAM,CAAA;IAChB,KAAK,CAAC,EAAC,MAAM,CAAA;IACb,kBAAkB,EAAC,MAAM,CAAA;CAC5B;AAID,wBAAsB,MAAM,CAAE,IAAI,EAAE,aAAa,iBAyDhD;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAC,MAAM,CAAC;IACZ,MAAM,EAAC,SAAS,CAAC;IACjB,GAAG,EAAC,aAAa,CAAA;CACpB;AACD,wBAAsB,KAAK,CAAC,IAAI,EAAC,YAAY;;;;;;;iBAahB,MAAM,EAAE;cACP,IAAI;;;;;;;;;;;iBADL,MAAM,EAAE;cACP,IAAI;;;;;;;;iBADL,MAAM,EAAE;cACP,IAAI;;;;GAyDjC"}