@cap-js/postgres 1.3.0 → 1.3.1

package/CHANGELOG.md

@@ -4,6 +4,10 @@
 - The format is based on [Keep a Changelog](http://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](http://semver.org/).
 
+### Version 1.3.1 - 2023-10-10
+
+- `cds build`-relevant files are now correctly packaged into the release. #266
+
 ### Version 1.3.0 - 2023-10-06
 
 ### Added

package/cds-plugin.js

@@ -5,5 +5,5 @@ if (!cds.env.fiori.lean_draft) {
 }
 
 if (cds.cli.command === 'build') {
-  module.exports = require('./build')
+  module.exports = require('./lib/build')
 }

package/lib/build.js

@@ -0,0 +1,54 @@
+const cds = require('@sap/cds')
+
+let BuildPlugin
+try {
+  ({ BuildPlugin } = require('@sap/cds-dk/lib/build'))
+} catch (e) {
+  if (e.code === 'ENOTFOUND') throw `No build plugin mechanism for @sap/cds-dk found. Please install @sap/cds-dk for development using 'npm i -D @sap/cds-dk@^7.3.0'`
+  else throw e
+}
+
+const { fs, path, rimraf } = cds.utils
+
+module.exports = class PostgresBuildPlugin extends BuildPlugin {
+  static hasTask() { // REVISIT: should be unnecessary -> plugin mechanism knows what to pull
+    return cds.requires.db.kind === 'postgres'
+  }
+
+  static getTaskDefaults() {
+    return { src: cds.env.folders.db }
+  }
+
+  init() {
+    this.task.dest = cds.env.build.target === '.' ? path.join('gen','pg') : path.join('gen', 'pg')
+  }
+
+  async clean() {
+    await rimraf(this.task.dest)
+  }
+
+  async build() {
+    const model = await this.model()
+    if (!model) {
+      return
+    }
+
+    const promises = []
+    promises.push(this.write({
+        dependencies: { '@sap/cds': '^7', '@cap-js/postgres': '^1' },
+        scripts: { start: 'cds-deploy' },
+      }).to('package.json'))
+    promises.push(this.write(cds.compile.to.json(model)).to(path.join('db', 'csn.json')))
+
+    let data
+    if (fs.existsSync(path.join(this.task.src, 'data'))) {
+      data = 'data'
+    } else if (fs.existsSync(path.join(this.task.src, 'csv'))) {
+      data = 'csv'
+    }
+    if (data) {
+      promises.push(this.copy(data).to(path.join('db', 'data')))
+    }
+    return Promise.all(promises)
+  }
+}

package/lib/func.js

@@ -2,7 +2,7 @@ const session = require('./session.json')
 
 const StandardFunctions = {
   session_context: x => {
-    let sql = `current_setting('${ session[x.val] || x.val }')`
+    let sql = `current_setting('${session[x.val] || x.val}')`
     if (x.val === '$now') sql += '::timestamp'
     return sql
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cap-js/postgres",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "CDS database service for Postgres",
   "homepage": "https://github.com/cap-js/cds-dbs/tree/main/postgres#cds-database-service-for-postgres",
   "repository": {
@@ -31,7 +31,7 @@
     "start": "docker-compose -f pg-stack.yml up -d"
   },
   "dependencies": {
-    "@cap-js/db-service": "^1.3.0",
+    "@cap-js/db-service": "^1.3.1",
     "pg": "^8"
   },
   "peerDependencies": {