@cedarjs/cli-data-migrate 1.0.0-canary.12316 → 1.0.0-canary.12318

package/dist/bin.js

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
-"use strict";var L=Object.create;var M=Object.defineProperty;var N=Object.getOwnPropertyDescriptor;var R=Object.getOwnPropertyNames;var V=Object.getPrototypeOf,U=Object.prototype.hasOwnProperty;var w=(t,r)=>()=>(t&&(r=t(t=0)),r);var W=(t,r,e,i)=>{if(r&&typeof r=="object"||typeof r=="function")for(let o of R(r))!U.call(t,o)&&o!==e&&M(t,o,{get:()=>r[o],enumerable:!(i=N(r,o))||i.enumerable});return t};var c=(t,r,e)=>(e=t!=null?L(V(t)):{},W(r||!t||!t.__esModule?M(e,"default",{value:t,enumerable:!0}):e,t));var a,m,C=w(()=>{"use strict";a=c(require("chalk")),m={error:a.default.bold.red,warning:a.default.hex("#ffa500"),highlight:a.default.hex("#ffa500"),success:a.default.green,info:a.default.grey,bold:a.default.bold,underline:a.default.underline,note:a.default.blue,tip:a.default.green,important:a.default.magenta,caution:a.default.red,link:a.default.hex("#e8e8e8")}});async function O({importDbClientFromDist:t,distPath:r}){let e,i=!1;if(t){if(!g.default.existsSync(r)){console.warn(`Can't find api dist at ${r}. You may need to build first: yarn rw build api`),process.exitCode=1;return}let p=f.default.join(r,"lib"),d=f.default.join(p,"db.js");if(!g.default.existsSync(d)){console.error(`Can't find db.js at ${d}. CedarJS expects the db.js file to be in the ${p} directory`),process.exitCode=1;return}e=(await import(d)).db}else(0,h.registerApiSideBabelHook)(),i=!0,e=require(f.default.join((0,b.getPaths)().api.lib,"db")).db;let o=await B(e);if(!o.length){console.info(m.success(`
-${H}
-`)),process.exitCode=0;return}let s={run:0,skipped:0,error:0},n=o.map(p=>{let d=f.default.basename(p.path,".js");return{title:d,skip(){return s.error>0?(s.skipped++,!0):!1},async task(){i||(0,h.registerApiSideBabelHook)();try{let{startedAt:u,finishedAt:I}=await G(e,p.path);s.run++,await T(e,{version:p.version,name:d,startedAt:u,finishedAt:I})}catch(u){s.error++,console.error(m.error(`Error in data migration: ${u.message}`))}}}}),l=new j.Listr(n,{renderer:"verbose"});try{await l.run(),await e.$disconnect(),console.log(),E(s),console.log(),s.error&&(process.exitCode=1)}catch{process.exitCode=1,await e.$disconnect(),console.log(),E(s),console.log()}}async function B(t){let r=(0,b.getPaths)().api.dataMigrations;if(!g.default.existsSync(r))return[];let e=g.default.readdirSync(r).filter(n=>["js",".ts"].some(l=>n.endsWith(l))).map(n=>{let[l]=n.split("-");return{version:l,path:f.default.join(r,n)}}),o=(await t.rW_DataMigration.findMany({orderBy:{version:"asc"}})).map(n=>n.version.toString());return e.filter(({version:n})=>!o.includes(n)).sort(q)}function q(t,r){let e=parseInt(t.version),i=parseInt(r.version);return e>i?1:e<i?-1:0}async function G(t,r){let e=require(r),i=new Date;return await e.default({db:t}),{startedAt:i,finishedAt:new Date}}async function T(t,{version:r,name:e,startedAt:i,finishedAt:o}){await t.rW_DataMigration.create({data:{version:r,name:e,startedAt:i,finishedAt:o}})}function E(t){t.run&&console.info(m.success(`${t.run} data migration(s) completed successfully.`)),t.error&&console.error(m.error(`${t.error} data migration(s) exited with errors.`)),t.skipped&&console.warn(m.warning(`${t.skipped} data migration(s) skipped due to previous error.`))}var g,f,j,h,b,H,P=w(()=>{"use strict";g=c(require("fs")),f=c(require("path")),j=require("listr2"),h=require("@cedarjs/babel-config"),b=require("@cedarjs/project-config");C();H="No pending data migrations run, already up-to-date."});var y=c(require("path")),S=require("dotenv-defaults"),$=require("yargs/helpers"),_=c(require("yargs/yargs")),D=require("@cedarjs/project-config");var v=c(require("terminal-link")),x=require("@cedarjs/project-config");var k="Run any outstanding Data Migrations against the database";function A(t){return t.option("import-db-client-from-dist",{type:"boolean",alias:["db-from-dist"],description:"Import the db client from dist",default:!1}).option("dist-path",{type:"string",alias:"d",description:"Path to the api dist directory",default:(0,x.getPaths)().api.dist}).epilogue(`Also see the ${(0,v.default)("Redwood CLI Reference","https://redwoodjs.com/docs/cli-commands#datamigrate-up")}`)}P();process.env.REDWOOD_ENV_FILES_LOADED||((0,S.config)({path:y.default.join((0,D.getPaths)().base,".env"),defaults:y.default.join((0,D.getPaths)().base,".env.defaults"),multiline:!0}),process.env.REDWOOD_ENV_FILES_LOADED="true");(0,_.default)((0,$.hideBin)(process.argv)).scriptName("data-migrate").command("$0",k,A,O).parse();
+"use strict";var I=Object.create;var D=Object.defineProperty;var L=Object.getOwnPropertyDescriptor;var N=Object.getOwnPropertyNames;var R=Object.getPrototypeOf,V=Object.prototype.hasOwnProperty;var M=(t,r)=>()=>(t&&(r=t(t=0)),r);var U=(t,r,i,o)=>{if(r&&typeof r=="object"||typeof r=="function")for(let e of N(r))!V.call(t,e)&&e!==i&&D(t,e,{get:()=>r[e],enumerable:!(o=L(r,e))||o.enumerable});return t};var p=(t,r,i)=>(i=t!=null?I(R(t)):{},U(r||!t||!t.__esModule?D(i,"default",{value:t,enumerable:!0}):i,t));var n,c,k=M(()=>{"use strict";n=p(require("chalk")),c={error:n.default.bold.red,warning:n.default.hex("#ffa500"),highlight:n.default.hex("#ffa500"),success:n.default.green,info:n.default.grey,bold:n.default.bold,underline:n.default.underline,note:n.default.blue,tip:n.default.green,important:n.default.magenta,caution:n.default.red,link:n.default.hex("#e8e8e8")}});async function P({importDbClientFromDist:t,distPath:r}){let i;if(t){if(!f.default.existsSync(r)){console.warn(`Can't find api dist at ${r}. You may need to build first: yarn rw build api`),process.exitCode=1;return}let a=m.default.join(r,"lib"),d=m.default.join(a,"db.js");if(!f.default.existsSync(d)){console.error(`Can't find db.js at ${d}. CedarJS expects the db.js file to be in the ${a} directory`),process.exitCode=1;return}i=(await import(d)).db}else{let a=(0,l.resolveFile)(m.default.join((0,l.getPaths)().api.lib,"db"));if(!a){console.error(`Can't find your db file in ${(0,l.getPaths)().api.lib}`),process.exitCode=1;return}let{mod:d}=await(0,h.bundleRequire)({filepath:a});i=d.db}let o=await W(i);if(!o.length){console.info(c.success(`
+${F}
+`)),process.exitCode=0;return}let e={run:0,skipped:0,error:0},g=o.map(a=>{let d=m.default.basename(a.path,".js");return{title:d,skip(){return e.error>0?(e.skipped++,!0):!1},async task(){try{let{startedAt:u,finishedAt:_}=await G(i,a.path);e.run++,await T(i,{version:a.version,name:d,startedAt:u,finishedAt:_})}catch(u){e.error++,console.error(c.error(`Error in data migration: ${u.message}`))}}}}),s=new E.Listr(g,{renderer:"verbose"});try{await s.run(),await i.$disconnect(),console.log(),A(e),console.log(),e.error&&(process.exitCode=1)}catch{process.exitCode=1,await i.$disconnect(),console.log(),A(e),console.log()}}async function W(t){let r=(0,l.getPaths)().api.dataMigrations;if(!f.default.existsSync(r))return[];let i=f.default.readdirSync(r).filter(s=>["js",".ts"].some(a=>s.endsWith(a))).map(s=>{let[a]=s.split("-");return{version:a,path:m.default.join(r,s)}}),e=(await t.rW_DataMigration.findMany({orderBy:{version:"asc"}})).map(s=>s.version.toString());return i.filter(({version:s})=>!e.includes(s)).sort(B)}function B(t,r){let i=parseInt(t.version),o=parseInt(r.version);return i>o?1:i<o?-1:0}async function G(t,r){let{mod:i}=await(0,h.bundleRequire)({filepath:r}),o=i.default,e=new Date;return await o({db:t}),{startedAt:e,finishedAt:new Date}}async function T(t,{version:r,name:i,startedAt:o,finishedAt:e}){await t.rW_DataMigration.create({data:{version:r,name:i,startedAt:o,finishedAt:e}})}function A(t){t.run&&console.info(c.success(`${t.run} data migration(s) completed successfully.`)),t.error&&console.error(c.error(`${t.error} data migration(s) exited with errors.`)),t.skipped&&console.warn(c.warning(`${t.skipped} data migration(s) skipped due to previous error.`))}var f,m,h,E,l,F,$=M(()=>{"use strict";f=p(require("fs")),m=p(require("path")),h=require("bundle-require"),E=require("listr2"),l=require("@cedarjs/project-config");k();F="No pending data migrations run, already up-to-date."});var b=p(require("path")),j=require("dotenv-defaults"),O=require("yargs/helpers"),S=p(require("yargs/yargs")),y=require("@cedarjs/project-config");var w=p(require("terminal-link")),v=require("@cedarjs/project-config");var x="Run any outstanding Data Migrations against the database";function C(t){return t.option("import-db-client-from-dist",{type:"boolean",alias:["db-from-dist"],description:"Import the db client from dist",default:!1}).option("dist-path",{type:"string",alias:"d",description:"Path to the api dist directory",default:(0,v.getPaths)().api.dist}).epilogue(`Also see the ${(0,w.default)("Redwood CLI Reference","https://redwoodjs.com/docs/cli-commands#datamigrate-up")}`)}$();process.env.REDWOOD_ENV_FILES_LOADED||((0,j.config)({path:b.default.join((0,y.getPaths)().base,".env"),defaults:b.default.join((0,y.getPaths)().base,".env.defaults"),multiline:!0}),process.env.REDWOOD_ENV_FILES_LOADED="true");(0,S.default)((0,O.hideBin)(process.argv)).scriptName("data-migrate").command("$0",x,C,P).parse();

package/dist/commands/upHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upHandler.d.ts","sourceRoot":"","sources":["../../src/commands/upHandler.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,oBAAoB,EAAiB,MAAM,UAAU,CAAA;AAEnE,wBAAsB,OAAO,CAAC,EAC5B,sBAAsB,EACtB,QAAQ,GACT,EAAE,oBAAoB,iBA2GtB;AA4ED,eAAO,MAAM,6BAA6B,wDACa,CAAA"}
+{"version":3,"file":"upHandler.d.ts","sourceRoot":"","sources":["../../src/commands/upHandler.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,oBAAoB,EAAiB,MAAM,UAAU,CAAA;AAEnE,wBAAsB,OAAO,CAAC,EAC5B,sBAAsB,EACtB,QAAQ,GACT,EAAE,oBAAoB,iBAuHtB;AAiFD,eAAO,MAAM,6BAA6B,wDACa,CAAA"}

package/dist/commands/upHandler.js

@@ -34,8 +34,8 @@ __export(upHandler_exports, {
 module.exports = __toCommonJS(upHandler_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
+var import_bundle_require = require("bundle-require");
 var import_listr2 = require("listr2");
-var import_babel_config = require("@cedarjs/babel-config");
 var import_project_config = require("@cedarjs/project-config");
 var import_colors = __toESM(require("../lib/colors"));
 async function handler({
@@ -43,7 +43,6 @@ async function handler({
   distPath
 }) {
   let db;
-  let requireHookRegistered = false;
   if (importDbClientFromDist) {
     if (!import_fs.default.existsSync(distPath)) {
       console.warn(
@@ -63,9 +62,17 @@ async function handler({
     }
     db = (await import(distLibDbPath)).db;
   } else {
-    (0, import_babel_config.registerApiSideBabelHook)();
-    requireHookRegistered = true;
-    db = require(import_path.default.join((0, import_project_config.getPaths)().api.lib, "db")).db;
+    const dbPath = (0, import_project_config.resolveFile)(import_path.default.join((0, import_project_config.getPaths)().api.lib, "db"));
+    if (!dbPath) {
+      console.error(`Can't find your db file in ${(0, import_project_config.getPaths)().api.lib}`);
+      process.exitCode = 1;
+      return;
+    }
+    const { mod } = await (0, import_bundle_require.bundleRequire)({
+      filepath: dbPath
+      // TODO: Add plugins
+    });
+    db = mod.db;
   }
   const pendingDataMigrations = await getPendingDataMigrations(db);
   if (!pendingDataMigrations.length) {
@@ -89,9 +96,6 @@ ${NO_PENDING_MIGRATIONS_MESSAGE}
         }
       },
       async task() {
-        if (!requireHookRegistered) {
-          (0, import_babel_config.registerApiSideBabelHook)();
-        }
         try {
           const { startedAt, finishedAt } = await runDataMigration(
             db,
@@ -174,9 +178,13 @@ function sortDataMigrationsByVersion(dataMigrationA, dataMigrationB) {
   return 0;
 }
 async function runDataMigration(db, dataMigrationPath) {
-  const dataMigration = require(dataMigrationPath);
+  const { mod } = await (0, import_bundle_require.bundleRequire)({
+    filepath: dataMigrationPath
+    // TODO: Add plugins
+  });
+  const dataMigration = mod.default;
   const startedAt = /* @__PURE__ */ new Date();
-  await dataMigration.default({ db });
+  await dataMigration({ db });
   const finishedAt = /* @__PURE__ */ new Date();
   return { startedAt, finishedAt };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli-data-migrate",
-  "version": "1.0.0-canary.12316+9fbbf96b8",
+  "version": "1.0.0-canary.12318+74d039296",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -25,8 +25,9 @@
     "test:unit": "yarn jest src"
   },
   "dependencies": {
-    "@cedarjs/babel-config": "1.0.0-canary.12316",
-    "@cedarjs/project-config": "1.0.0-canary.12316",
+    "@cedarjs/babel-config": "1.0.0-canary.12318",
+    "@cedarjs/project-config": "1.0.0-canary.12318",
+    "bundle-require": "^5.1.0",
     "chalk": "4.1.2",
     "dotenv-defaults": "5.0.2",
     "execa": "5.1.1",
@@ -36,7 +37,7 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "1.0.0-canary.12316",
+    "@cedarjs/framework-tools": "1.0.0-canary.12318",
     "@prisma/client": "5.20.0",
     "@types/fs-extra": "11.0.4",
     "@types/yargs": "17.0.33",
@@ -45,5 +46,5 @@
     "tsx": "4.19.4",
     "typescript": "5.6.2"
   },
-  "gitHead": "9fbbf96b848616acb9561c86b887e355c92ef351"
+  "gitHead": "74d03929677d47123af04b297d4748e7d125d36e"
 }