@sap/cds-dk 10.1.2 → 10.2.0

package/node_modules/@sap/cds/lib/ql/core/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "@cap.core/ql",
+  "version": "2.1.7",
+  "description": "Minimalistic implementation of cds.ql, carved out from CAP.",
+  "repository": "https://github.com/cap-js/ql.git",
+  "author": "daniel.hutzel@sap.com",
+  "type": "module",
+  "main": "lib/index.js",
+  "files": [
+    "lib",
+    "cql/parser.min.js",
+    "@types"
+  ],
+  "dependencies": {
+    "@types/cap.core__ql": "file:./@types"
+  },
+  "scripts": {
+    "peggy": "npx peggy cql/grammar.pegjs -o cql/parser.js --format es --allowed-start-rules CQL,subject,columns,values,ref,val,expr,set,with,where,groupBy,orderBy",
+    "terser": "npx terser cql/parser.js -o cql/parser.min.js --compress --mangle --ecma 2022 --source-map",
+    "build": "npm run peggy && npm run terser",
+    "test": "npx vitest run"
+  },
+  "license": "Apache-2.0"
+}

package/node_modules/@sap/cds/lib/ql/core/readme.md

@@ -0,0 +1,99 @@
+# Minimalistic `cds.ql`
+
+This is a minimalistic implementation of `cds.ql` that supports parsing and constructing SQL and [CQL](https://cap.cloud.sap/docs/cds/cql) queries into [CQN](https://cap.cloud.sap/docs/cds/cqn) objects. It provides a fluent API for constructing queries as well as a parser for CQL strings, including tagged template literals.
+
+### Setup
+
+```shell
+npm add cap-js/ql
+```
+### Usage
+
+Import from ESM modules, or from CommonJS modules:
+```js
+import { cql } from '@cap.core/ql'
+```
+```js
+const { cql } = require ('@cap.core/ql')
+```
+
+Then construct queries like so:
+
+```js
+cql`SELECT ID, title from Books`
+```
+```js
+cql`SELECT from Authors {
+   ID, name, books {
+      ID, title, genre.name as genre
+   }
+}`
+```
+### Try it in Node REPL
+
+Start [Node's REPL](https://nodejs.org/learn/command-line/how-to-use-the-nodejs-repl) from your command line:
+
+```sh
+node
+```
+
+Within there import the `cql` function:
+
+```js
+const { cql } = await import ('@cap.core/ql')
+```
+
+Then copy and paste this:
+
+```js
+let ID = 201
+cql`INSERT into Books ${{ ID, title:'Wuthering Heights' }}`
+cql`UPSERT into Books ${{ ID, title:'Wuthering Heights' }}`
+cql`UPDATE Books with ${{ stock:111 }} where ID=${ID}`
+cql`SELECT ID, title, stock from Books where ID=${ID}`
+cql`DELETE from Books where ${[ID]}`
+cql`DELETE Books[${ID}]` // → same as above
+```
+
+> ⇒  the constructed CQN query objects are printed as output.
+
+## Contribute
+
+Feel invited to contribute.
+
+```sh
+git clone https://github.com/cap-js/ql cap/core/ql
+cd cap/core/ql
+npm i
+```
+
+
+### Try it in REPL or Browser
+
+Launch Node's REPL, with `cqn` and all other API entry points preloaded into `global` constants:
+
+```shell
+npm run in:repl
+```
+
+
+Alternatively, launch a server and open http://localhost:4004 in your browser:
+
+```shell
+npm run in:browser
+```
+
+Then try out the API in your browser's [Developer Tools](https://developer.mozilla.org/docs/Learn_web_development/Howto/Tools_and_setup/What_are_browser_developer_tools) console – for example, copy and paste the sample lines above to start with.
+
+### Running Tests
+
+```shell
+npx vitest
+```
+```shell
+cds test
+```
+```shell
+chest
+```
+> The latter ones are for users of [CAP](https://cap.cloud.sap) in general, or [@cap.core/cds-test](https://github.com/cap-js/cds-test) in particular.

package/node_modules/@sap/cds/lib/ql/core/upstream.json

@@ -0,0 +1,5 @@
+{
+  "repository": "https://github.com/cap-js/ql.git",
+  "revision": "5b5341821f7d58b05803c0cc6fc91ad494178b81",
+  "version": "2.1.7"
+}

package/node_modules/@sap/cds/lib/req/spawn.js

@@ -9,7 +9,7 @@ module.exports = function spawn (o, fn, /** @type {import('../index')} */ cds=th
     return cds._with (tx, async ()=> {
       // REVISIT: The model must be set _after_ run to make sure that cds.context.tenant is correctly set.
       //          Otherwise, `model4` could query the wrong database to check for extensions.
-      if (cds.model && (cds.env.requires.extensibility || cds.env.requires.toggles)) {
+      if (cds.model && (cds.requires.extensibility || cds.requires.toggles)) {
         const ctx = cds.context
         const ExtendedModels = require('../srv/srv-models') // the sentinel is automatically started when required
         cds.context.model = await cds.tx(() => ExtendedModels.model4(ctx.tenant, ctx.features))

package/node_modules/@sap/cds/lib/srv/bindings.js

@@ -1,165 +1,160 @@
 
 const cds = require ('..')
-const { exec } = require('child_process')
 const LOG = cds.log('serve|bindings',{label:'cds'})
-const registry = '~/.cds-services.json'
-const fs = require('fs')
+const home = require('os').homedir()
+const registry = home + '/.cds/services'
+const { execSync:exec } = require ('node:child_process')
+const fs = require('node:fs/promises')
+const { join } = require('path')
 
 class Bindings {
 
-  provides = {}
+  services = {}
   servers = {}
   #bound = {}
 
   then (r,e) {
-    const info = ()=> LOG.info ('using bindings from:', { registry })
-    if (cds.watched) cds.prependOnceListener ('connect',info); else info()
+    const info = ()=> LOG.info ('using bindings from:', { registry: '~'+ registry.slice(home.length) })
+    if (cds.watched) cds.prependOnceListener ('connect',info)
     delete Bindings.prototype.then // only once per process
-    cds.once('listening', server => this.export (cds.service.providers, server.url))
+    cds.once('listening', this.export.bind(this))
     return this.import() .then (r,e)
   }
 
-  bind (service) {
+
+  bind (service, kind) {
     let required = cds.requires [service]
-    let binding = this.provides [service]
+    let binding = this.services [service] || this.services [required?.service]
 
-    if (binding?.endpoints && !required?.credentials) {
-      // > Re-route requests to the mock service running locally
+    if (binding?.endpoints) {
 
       const server = this.servers [binding.server]
-      const kind = [ required?.kind, 'hcql', 'rest', 'odata' ].find (k => k in binding.endpoints)
-      const path = binding.endpoints [kind]
-
-      if (typeof required !== 'object') required = {}
-      cds.env.requires[service] = required = {
-        kind, ...cds.requires.kinds [kind], ...required,
-        credentials: {
-          ...required.credentials,
-          ...binding.credentials,
-          url: server.url + path
-        },
+
+      // If a kind is specified, return a new detached config object
+      if (kind) {
+        let endpoint = binding.endpoints [kind] || cds.error (`Service ${service} doesn't have an endpoint for ${kind}`)
+        return {
+          ... !required || required === true ? { ...cds.requires.kinds[kind] } : required,
+          kind, credentials: {
+            ...required.credentials,
+            ...binding.credentials,
+            url: server.url + endpoint,
+          }
+        }
+      }
+
+      // Ensure we have a required entry for this binding
+      if (!required || required === true) {
+        required = cds.requires[service] = { ...cds.requires.kinds[kind] }
       }
-      required.kind = kind // override kind from binding
+
+      // Determine the kind to use from binding, if not specified
+      kind = required.kind = [ required.kind, 'hcql', 'rest', 'odata' ].find (k => k in binding.endpoints)
+      || Object.keys(binding.endpoints)[0]
+
+      // Fill in credentials from binding, but do not override existing ones
+      Object.assign (required.credentials ??= {}, {
+        ...binding.credentials,
+        url: server.url + binding.endpoints [kind],
+      })
 
       // REVISIT: temporary fix to inherit kind as well for mocked odata services
       // otherwise mocking with two services does not work for kind:odata-v2
       if (kind === 'odata-v2' || kind === 'odata-v4') required.kind = 'odata'
-
-      // Finally, ensure the changes are mirrored in cds.requires overlays as well
-      if (required.service) cds.requires[required.service] = required
     }
 
     return this.#bound [service] = required
   }
 
   // used by cds.connect
-  at (service) {
-    return this.#bound [service] ??= this.bind (service)
+  at (service, _kind) {
+    if (_kind) return this.#bound [`${service}:${_kind}`] ??= this.bind (service,_kind)
+    return this.#bound [service] ??= this.bind (service, _kind)
   }
 
-  get registry() {
-    return Bindings.registry ??= registry.replace(/^~/, require('os').homedir())
-  }
 
-  async load (read = fs.promises.readFile) {
+  async import() {
+
     LOG.debug ('reading bindings from:', registry)
-    try {
-      let src = read (this.registry)
-      let {cds} = JSON.parse (src.then ? await src : src)
-      Object.assign (this, cds)
-    }
-    catch { /* ignored */ }
-    return this
-  }
 
-  async store (write = fs.promises.writeFile) {
-    LOG.debug ('writing bindings to:', registry)
-    const json = JSON.stringify ({ cds: this },null,'  ')
-    return write (this.registry, json)
-  }
+    // Fetch all binding files from the registry folder, and get the list of active PIDs in parallel
+    const $ = cds.utils.sh, unx = process.platform !== 'win32'
+    const ps = unx ? $`ps -o pid=` : $`tasklist /fo csv /nh`
+    const [ all, pids ] = await Promise.all([
+      // read all files in folder
+      fs.readdir(registry) .catch(()=>[]) .then (async all => await Promise.all(all.map (each => {
+        if (!each.endsWith('.json')) return; let file = join(registry,each)
+        return fs.readFile(file).then(JSON.parse).then(json => ({ file, ...json }))
+      }))), //.catch (ignore),
+      // fetch active process ids
+      async function ps_pids() {
+        let pids = (await ps) .map (l => l.trim())
+        if (!unx) pids = pids.map (l => l.trim().split(',')[1]?.replace(/"/g,''))
+        return pids.reduce ((dd,pid) => (dd[pid]=1, dd), {})
+      }() .catch (ignore)
+    ])
+
+    // Load all binding files from the registry folder, cleaning up stale ones
+    await Promise.all (all.map (each => { try { if (!each) return
+      const { file, server, services } = each, id = server.port
+      if (server.pid in pids) {
+        for (let each in services) this.services[each] = {
+          ...services[each],
+          server:id
+        }
+        this.servers[id] = {
+          bindings: file.replace(home,'~'),
+          ...server
+        }
+      } else fs.unlink (file) .catch (ignore) // stale server
+    } catch { /* ignored */ }}))
+
+    // Fill in loaded bindings to cds.required services
+    for (let each in cds.requires)
+      this.bind (each)
 
-  async import() {
-    await this.load()
-    for (let each in cds.env.requires) this.bind (each)
     return this
   }
 
-  async export (services, url) {
-    this.cleanup (url)
-    await this.cleanupStaleServers()
 
-    const { servers, provides } = this, { pid } = process
-    // register our server
-    servers[pid] = {
-      root: 'file://' + cds.root,
-      url
+  async export() {
+
+    const file = join (registry, cds.server.port+'.json')
+
+    // Binding information about the current server
+    const server = this.servers[cds.server.port] = {
+      bindings: file.replace(home,'~'),
+      root: cds.root.replace(home,'~'),
+      url: cds.server.url,
+      port: cds.server.port,
+      ppid: process.ppid,
+      pid: process.pid,
     }
-    // register our services
-    for (let srv of services) {
-      // if (each.name in cds.env.requires)  continue
-      provides[srv.name] = {
+    try {
+      server.tty = exec ('tty',{stdio:['inherit']}) .toString().trim()
+    } catch { /* ignored */ }
+
+    // Binding information for provided services
+    const all = this.services, provided = {}
+    for (let srv of cds.service.providers) { if (srv.external) continue
+      all[srv.name] = provided[srv.name] = {
+        base: server.url,
         endpoints: Object.fromEntries (srv.endpoints.map (ep => [ ep.kind, ep.path ])),
-        server: pid,
+        entities: Object.keys(srv.entities),
+        server: cds.server.port
       }
     }
-    process.on ('exit', ()=> this.purge())
-    cds.on ('shutdown', ()=> this.purge())
-    return this.store()
-  }
 
-  purge() {
-    if (this.done) return;
-    this.load (fs.readFileSync)
-    LOG.debug ('purging bindings from:', registry)
-    this.cleanup()
-    this.store (fs.writeFileSync)
-    this.done = true
-  }
+    LOG.debug ('writing bindings to:', file)
+    const binding = { server, services: provided }
+    await fs.mkdir (registry, { recursive: true })
+    await fs.writeFile (file, JSON.stringify(binding,null,2))
 
-  /**
-   * Remove all services served by this server or at the given url.
-   */
-  cleanup (url, pid=process.pid) {
-    const { servers, provides } = this
-    for (let [key,srv] of Object.entries (provides))
-      if (srv.server === pid || url && srv.credentials?.url?.startsWith(url)) delete provides [key]
-    delete servers [pid.toString()]
-    return this
+    // Clean up the binding file on exit or shutdown
+    process.on ('exit', ()=> fs.unlink(file).catch(ignore))
+    cds.on ('shutdown', ()=> fs.unlink(file).catch(ignore))
   }
 
-  async cleanupStaleServers() {
-    const { servers } = this
-    if (!Object.keys(servers).length) return
-
-    const pids = await new Promise((resolve) => {
-      const command = process.platform === 'win32' ? 'tasklist /fo csv /nh' : 'ps -e -o pid='
-      exec(command, (error, stdout) => {
-        if (error) {
-          LOG.warn('Error fetching process IDs with command:', command, error)
-          return resolve([])
-        }
-        resolve(stdout.split('\n').map(line => line.trim())
-          .map(line => {
-            if (process.platform === 'win32') {
-              const parts = line.split(',')
-              const pid = parts[1]?.replace(/"/g, '')
-              return pid ? parseInt(pid, 10) : NaN
-            }
-            return parseInt(line, 10)
-          })
-          .filter(pid => !isNaN(pid)))
-      })
-    })
-    LOG.debug(`fetched ${pids.length} PIDs`)
-    const pidSet = new Set(pids)
-    for (let key of Object.keys(servers)) {
-      const pid = parseInt(key, 10)
-      if (!pidSet.has(pid)) {
-        LOG.debug(`cleaning up bindings for stale PID ${pid}`)
-        this.cleanup(undefined, pid)
-      }
-    }
-  }
 }
 
 const {NODE_ENV} = process.env
@@ -168,3 +163,4 @@ if (NODE_ENV === 'test' || global.it || cds.env.no_bindings) {
 } else {
   module.exports = new Bindings
 }
+const ignore = ()=>{}

package/node_modules/@sap/cds/lib/srv/cds-connect.js

@@ -1,4 +1,4 @@
-const cds = require('..'), LOG = cds.log('cds.connect')
+const cds = require('..')
 const TRACE = cds.debug('trace')
 
 /**
@@ -15,12 +15,13 @@ const connect = module.exports = async function cds_connect (options) {
 
 /**
  * Connect to a specific service, either served locally, with ad-hoc options
- * or with options configured in cds.env.requires.<datasource>.
+ * or with options configured in cds.requires.<datasource>.
  * @param { string|Function|object } [datasource]
  * @param {{ kind?:String, impl?:String }} [options]
  * @returns { Promise<import('./cds.Service')> }
  */
 connect.to = (datasource, options) => {
+  if (datasource.raw) [[datasource], options ] = [datasource]
   let Service = cds.service.factory
   if (typeof datasource === 'object' && !datasource.name) [options,datasource] = [datasource] // .to({ options })
   else if (datasource) {
@@ -32,12 +33,6 @@ connect.to = (datasource, options) => {
     TRACE?.time(`cds.connect.to ${datasource}`.padEnd(22).slice(0,22))
     const o = Service._is_service_class ? {} : options4 (datasource, options)
     const m = await model4 (o)
-    // check if required service definition exists
-    const required = cds.requires[datasource]
-    if (required?.model?.length && datasource !== 'db' && !m.definitions[required.service||datasource]) {
-      LOG.error(`No service definition found for '${required.service || datasource}', as required by 'cds.requires.${datasource}':`, required)
-      throw new Error (`No service definition found for '${required.service || datasource}'`)
-    }
     // construct new service instance
     let srv = await new Service (datasource,m,o); await (Service._is_service_class ? srv.init?.() : Service.init?.(srv))
     if (!srv.isDatabaseService && _is_queued(o)) srv = cds.queued(srv)
@@ -57,7 +52,12 @@ connect.to = (datasource, options) => {
 function options4 (name, _o) {
   if (name?.startsWith('http:')) [_o,name] = [{ url:name }]
   const [, kind=_o?.kind, url=_o?.url ] = /^(\w+):(.*)/.exec(name) || []
-  const conf = cds.service.bindings.at(name) || cds.requires[name] || cds.requires[kind] || cds.requires.kinds[name] || cds.requires.kinds[kind]
+  const conf = cds.service.bindings.at (name,kind)
+    || kind && cds.requires[`${name}/#${kind}`]
+    || cds.requires[name]
+    || cds.requires[kind]
+    || cds.requires.kinds[name]
+    || cds.requires.kinds[kind]
   const o = { kind, ...conf, ..._o }
   if (!o.kind) o.kind = (url||conf?.credentials?.url)?.match (/\/(hcql|rest|odata)\//)?.[1]
   if (!o.kind && !o.impl && !o.silent) throw cds.error(
@@ -72,7 +72,8 @@ function options4 (name, _o) {
 function model4 (o) {
   if (o.model?.definitions) return o.model // got a CSN already? -> use it
   if (cds.model) return cds.model         // use global model if available
-  if (o.model) return cds.load (o.model) // load specified model from file
+  if (o.model && (o.model_kind === undefined || o.model_kind === 'cds'))
+    return cds.load (o.model)          // load specified model from file
 }
 
 // at least one option is truthy and none is false

package/node_modules/@sap/cds/lib/srv/cds-serve.js

@@ -62,14 +62,23 @@ async function _construct (services, o) {
 
   // Construct services, adding upfront promises to cds.services
   return Promise.all (defs.map (d => {
-    const n = cds.requires[d.name]?.name || d.name; o.service = d.name
-    return cds.services[n] = cds.services[d.name] = new Service(n,m,o) .then(init) .then (srv => {
-      if (d.is_external) srv.mocked = true
-      if (d.name !== n) Object.defineProperty (cds.services, d.name, {value:srv})
-      if (!o.silent) cds.emit (`serving:${n}`, srv)
-      return cds.services[n] = cds.services[d.name] = srv // replacing upfront promises with real services
-    })
+    const required = cds.requires[d.name], name = required?._name || d.name
+    const promised = new Service (name, m, o, o.service = d.name)
+      .then (init)
+      .then (srv => {
+        if (d.is_external) srv.mocked = true //> mark mocked external services
+        if (!o.silent) cds.emit (`serving:${name}`, srv)
+        return cds.services[name] = _aliased (name, srv, d) // replace promise
+      })
+    return cds.services[name] = _aliased (name, promised, d)
   }))
+
+  // Also register under the service definition's name, if different from the required name
+  function _aliased (name, srv, d) {
+    if (name !== d.name)
+      Object.defineProperty (cds.services, d.name, { value:srv, configurable:true })
+    return srv
+  }
 }
 
 

package/node_modules/@sap/cds/lib/srv/cds.Service.js

@@ -2,7 +2,7 @@ const CoreService = require('./srv-dispatch')
 const Request = require('../req/request')
 const Event = require('../req/event')
 const cds = require('../index')
-
+const { SELECT, INSERT, UPDATE, UPSERT, DELETE } = cds.ql
 
 /**
  * This class constitutes the API used by service consumers to send requests, and emit events.
@@ -23,6 +23,7 @@ class ConsumptionAPI extends CoreService {
   }
 
   send (...args) {
+    if (args[1]?.raw) args = [ args[0], String.raw(...args.slice(1)) ]
     const req = _req4 (...args)
     return this.dispatch (req)
   }
@@ -61,6 +62,7 @@ class ConsumptionAPI extends CoreService {
   create (...args) { return INSERT.into(...args).bind(this) }
   update (...args) { return UPDATE.entity(...args).bind(this) }
   upsert (...args) { return UPSERT(...args).bind(this) }
+  stream (...args) { return SELECT.stream(...args).bind(this) }
   exists (...args) { return SELECT.one([1]).from(...args).bind(this) }
 
   /**
@@ -111,7 +113,7 @@ class ReflectionAPI extends ConsumptionAPI {
   get actions()    {
     return super.actions = this.reflect('actions', d => d.kind === 'action' || d.kind === 'function')
   }
-  reflect (property, filter) {
+  /** @returns {any} */ reflect (property, filter) {
     if (typeof property === 'function') filter = property
     return this.model?.childrenOf (this.namespace, filter) || []
   }
@@ -154,10 +156,14 @@ class Service extends ReflectionAPI {
 
   // Handler registration API
   prepend (fn) { this.handlers.prepend(this,fn); return this }
-  /** @typedef {( event, entity?, handler:(req:import('../req/request'))=>{})=> Service} boa */
-  /** @type boa */ before (...args) { return this.handlers.register (this, 'before', ...args) }
-  /** @type boa */ on     (...args) { return this.handlers.register (this, 'on',     ...args) }
-  /** @type boa */ after  (...args) { return this.handlers.register (this, 'after',  ...args) }
+  /** @typedef { 'READ'|'SELECT'|'CREATE'|'INSERT'|'UPSERT'|'UPDATE'|'DELETE'|'NEW'|'EDIT'|'PATCH'|'SAVE'|'DISCARD'|'COMMIT'|'ROLLBACK' | (string&{}) } eve */
+  /** @typedef { import('../req/request') } req */
+  /** @typedef { (req:req)=>any } handler */
+  /** @typedef {( event:eve|eve[], entity_or_handler: handler | string | object, handler?: handler)=> Service} befon */
+  /** @typedef {( event:eve|eve[], entity, handler:(results:any[], req:req)=>any)=> Service} after */
+  /** @type befon */ before (...args) { return this.handlers.register (this, 'before', ...args) }
+  /** @type befon */ on     (...args) { return this.handlers.register (this, 'on',     ...args) }
+  /** @type after */ after  (...args) { return this.handlers.register (this, 'after',  ...args) }
   reject (e, path) { return this.handlers.register (this, 'before', e, path,
     r => r.reject (405, `Event "${r.event}" not allowed for entity "${r.path}".`)
   )}
@@ -197,7 +203,7 @@ const Resolver = require('./srv-resolve')
 
 const is_object = x => typeof x === 'object'
 const is_query = x => x?.bind || Array.isArray(x) && !x.raw
-const is_rest = x => typeof x === 'string' && x[0] === '/'
+const is_rest = x => x.raw ? x[0][0] === '/' : typeof x === 'string' && x[0] === '/'
 const _service_in = m => cds.linked(m).services?.[0]?.name
 || cds.error.expected `${{model:m}} to be a CSN with a single service definition`
 

package/node_modules/@sap/cds/lib/srv/factory.js

@@ -18,7 +18,8 @@ function ServiceFactory (name, model, options) {
   async function _use (impl) { switch (typeof impl) {
     case 'function':
       if (impl._is_service_class) return new impl (name, model, o)
-      return _use (_kind(), /*with:*/ o.impl = _legacy(impl) || impl)
+      if (_is_class(impl)) return new impl (name, o)
+      return _use (_kind(), /*with:*/ o.impl = impl)
     case 'object':
       return _use (impl[name] || impl.default || _kind())
     case 'string':
@@ -36,6 +37,10 @@ function ServiceFactory (name, model, options) {
     default: throw cds.error`Invalid service implementation for ${name}: ${impl}`
   }}
 
+  function _is_class (fn) {
+    return fn.prototype && /^class\b/.test(Function.prototype.toString.call(fn))
+  }
+
   function _kind (kind = o.kind ??= def['@kind'] || 'app-service') {
     const {impl} = cds.requires[kind] || cds.requires.kinds[kind] || cds.error `No configuration found for 'cds.requires.${kind}'`
     return impl || cds.error `No 'impl' configured for 'cds.requires.kinds.${kind}'`
@@ -43,7 +48,7 @@ function ServiceFactory (name, model, options) {
 }
 
 
-const exts = process.env.CDS_TYPESCRIPT ? ['.ts','.js','.mjs'] : ['.js','.mjs']
+const exts = ['.ts','.js','.mjs']
 const _source4 = d => d['@source'] || d.$location?.file
 const _sibling = d => {
   let file = _source4(d); if (!file) return
@@ -57,13 +62,6 @@ const _sibling = d => {
     }
   }
 }
-const _legacy = impl => { // legacy hello-world style class
-  if (impl.prototype && /^class\b/.test(impl)) return function() {
-    const legacy = new impl
-    for (let k of Reflect.ownKeys(impl.prototype))
-      k === 'constructor' || k === 'prototype' || this.on(k, legacy[k].bind(legacy))
-  }
-}
 
 
 /**
@@ -73,6 +71,6 @@ const _legacy = impl => { // legacy hello-world style class
 exports.init = async function (srv) {
   const {impl} = srv.options; if (typeof impl === 'function' && !impl._is_service_class)
     await impl.call(srv, srv)
-  await srv.init()
+  if (srv.init) await srv.init()
   return srv
 }