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

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 d=(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,c,E=w(()=>{"use strict";a=d(require("chalk")),c={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(!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 p=m.default.join(r,"lib","db.js");if(!f.default.existsSync(p)){console.error(`Can't find db.js at ${p}. Redwood expects the db.js file to be in the ${m.default.join(r,"lib")} directory`),process.exitCode=1;return}e=(await import(p)).db}else(0,u.registerApiSideBabelHook)(),i=!0,e=require(m.default.join((0,h.getPaths)().api.lib,"db")).db;let o=await B(e);if(!o.length){console.info(c.success(`
-${q}
-`)),process.exitCode=0;return}let s={run:0,skipped:0,error:0},n=o.map(p=>{let D=m.default.basename(p.path,".js");return{title:D,skip(){return s.error>0?(s.skipped++,!0):!1},async task(){i||(0,u.registerApiSideBabelHook)();try{let{startedAt:g,finishedAt:I}=await H(e,p.path);s.run++,await T(e,{version:p.version,name:D,startedAt:g,finishedAt:I})}catch(g){s.error++,console.error(c.error(`Error in data migration: ${g.message}`))}}}}),l=new C.Listr(n,{renderer:"verbose"});try{await l.run(),await e.$disconnect(),console.log(),j(s),console.log(),s.error&&(process.exitCode=1)}catch{process.exitCode=1,await e.$disconnect(),console.log(),j(s),console.log()}}async function B(t){let r=(0,h.getPaths)().api.dataMigrations;if(!f.default.existsSync(r))return[];let e=f.default.readdirSync(r).filter(n=>["js",".ts"].some(l=>n.endsWith(l))).map(n=>{let[l]=n.split("-");return{version:l,path:m.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(G)}function G(t,r){let e=parseInt(t.version),i=parseInt(r.version);return e>i?1:e<i?-1:0}async function H(t,r){let e=await import(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 j(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,C,u,h,q,$=w(()=>{"use strict";f=d(require("fs")),m=d(require("path")),C=require("listr2"),u=require("@cedarjs/babel-config"),h=require("@cedarjs/project-config");E();q="No pending data migrations run, already up-to-date."});var b=d(require("path")),S=require("dotenv-defaults"),_=require("yargs/helpers"),P=d(require("yargs/yargs")),y=require("@cedarjs/project-config");var v=d(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")}`)}$();process.env.REDWOOD_ENV_FILES_LOADED||((0,S.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,P.default)((0,_.hideBin)(process.argv)).scriptName("data-migrate").command("$0",k,A,O).parse();
+"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();

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

@@ -1 +1 @@
-{"version":3,"file":"installHandler.d.ts","sourceRoot":"","sources":["../../src/commands/installHandler.ts"],"names":[],"mappings":"AAUA,wBAAsB,OAAO,kBAsD5B;AAED,eAAO,MAAM,uBAAuB,8HAMlC,CAAA;AAEF,eAAO,MAAM,8BAA8B,2EAC+B,CAAA;AAE1E,eAAO,MAAM,KAAK,QAMN,CAAA"}
+{"version":3,"file":"installHandler.d.ts","sourceRoot":"","sources":["../../src/commands/installHandler.ts"],"names":[],"mappings":"AAUA,wBAAsB,OAAO,kBAmD5B;AAED,eAAO,MAAM,uBAAuB,8HAMlC,CAAA;AAEF,eAAO,MAAM,8BAA8B,2EAC+B,CAAA;AAE1E,eAAO,MAAM,KAAK,QAMN,CAAA"}

package/dist/commands/installHandler.js

@@ -34,9 +34,9 @@ __export(installHandler_exports, {
   notes: () => notes
 });
 module.exports = __toCommonJS(installHandler_exports);
-var import_node_fs = __toESM(require("node:fs"));
-var import_node_path = __toESM(require("node:path"));
+var import_path = __toESM(require("path"));
 var import_execa = __toESM(require("execa"));
+var import_fs_extra = __toESM(require("fs-extra"));
 var import_listr2 = require("listr2");
 var import_project_config = require("@cedarjs/project-config");
 var import_colors = __toESM(require("../lib/colors"));
@@ -47,11 +47,8 @@ async function handler() {
       {
         title: "Creating the dataMigrations directory...",
         task() {
-          import_node_fs.default.mkdirSync(redwoodProjectPaths.api.dataMigrations, {
-            recursive: true
-          });
-          import_node_fs.default.writeFileSync(
-            import_node_path.default.join(redwoodProjectPaths.api.dataMigrations, ".keep"),
+          import_fs_extra.default.outputFileSync(
+            import_path.default.join(redwoodProjectPaths.api.dataMigrations, ".keep"),
             ""
           );
         }
@@ -60,8 +57,8 @@ async function handler() {
         title: "Adding the RW_DataMigration model to schema.prisma...",
         task() {
           const dbSchemaFilePath = redwoodProjectPaths.api.dbSchema;
-          const dbSchemaFileContent = import_node_fs.default.readFileSync(dbSchemaFilePath, "utf-8");
-          import_node_fs.default.writeFileSync(
+          const dbSchemaFileContent = import_fs_extra.default.readFileSync(dbSchemaFilePath, "utf-8");
+          import_fs_extra.default.writeFileSync(
             dbSchemaFilePath,
             [dbSchemaFileContent.trim(), "", RW_DATA_MIGRATION_MODEL, ""].join(
               "\n"

package/dist/commands/upHandler.js

@@ -52,13 +52,11 @@ async function handler({
       process.exitCode = 1;
       return;
     }
-    const distLibDbPath = import_path.default.join(distPath, "lib", "db.js");
+    const distLibPath = import_path.default.join(distPath, "lib");
+    const distLibDbPath = import_path.default.join(distLibPath, "db.js");
     if (!import_fs.default.existsSync(distLibDbPath)) {
       console.error(
-        `Can't find db.js at ${distLibDbPath}. Redwood expects the db.js file to be in the ${import_path.default.join(
-          distPath,
-          "lib"
-        )} directory`
+        `Can't find db.js at ${distLibDbPath}. CedarJS expects the db.js file to be in the ${distLibPath} directory`
       );
       process.exitCode = 1;
       return;
@@ -176,7 +174,7 @@ function sortDataMigrationsByVersion(dataMigrationA, dataMigrationB) {
   return 0;
 }
 async function runDataMigration(db, dataMigrationPath) {
-  const dataMigration = await import(dataMigrationPath);
+  const dataMigration = require(dataMigrationPath);
   const startedAt = /* @__PURE__ */ new Date();
   await dataMigration.default({ db });
   const finishedAt = /* @__PURE__ */ new Date();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/cli-data-migrate",
-  "version": "1.0.0-canary.12311+42cf2e406",
+  "version": "1.0.0-canary.12316+9fbbf96b8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -21,12 +21,12 @@
     "build:types": "tsc --build --verbose",
     "prepublishOnly": "NODE_ENV=production yarn build",
     "test": "yarn test:unit && yarn test:dist",
-    "test:dist": "yarn vitest run ./dist.test.ts",
-    "test:unit": "yarn vitest run src/"
+    "test:dist": "yarn jest ./dist.test.ts",
+    "test:unit": "yarn jest src"
   },
   "dependencies": {
-    "@cedarjs/babel-config": "1.0.0-canary.12311",
-    "@cedarjs/project-config": "1.0.0-canary.12311",
+    "@cedarjs/babel-config": "1.0.0-canary.12316",
+    "@cedarjs/project-config": "1.0.0-canary.12316",
     "chalk": "4.1.2",
     "dotenv-defaults": "5.0.2",
     "execa": "5.1.1",
@@ -36,14 +36,14 @@
     "yargs": "17.7.2"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "1.0.0-canary.12311",
+    "@cedarjs/framework-tools": "1.0.0-canary.12316",
     "@prisma/client": "5.20.0",
     "@types/fs-extra": "11.0.4",
     "@types/yargs": "17.0.33",
+    "jest": "29.7.0",
     "memfs": "4.17.2",
     "tsx": "4.19.4",
-    "typescript": "5.6.2",
-    "vitest": "2.1.9"
+    "typescript": "5.6.2"
   },
-  "gitHead": "42cf2e406127f07e7047bb9bae543d35e6e731b7"
+  "gitHead": "9fbbf96b848616acb9561c86b887e355c92ef351"
 }