@sap/cds 8.5.0 → 8.6.0

package/lib/compile/to/sql.js

@@ -7,13 +7,20 @@ const TRACE = cds.debug('trace')
 
 function cds_compile_to_sql (csn,_o) {
   TRACE?.time('cdsc.compile 2sql'.padEnd(22))
-  csn = cds.minify(csn)
-  const o = cdsc._options.for.sql(_o) //> used twice below...
-  const all = cdsc.to.sql(csn,o) .map (each => each.replace(/^-- .+\n/,''))  //> strip comments
-  const sql = unfold_ddl(all, csn, o)
-  TRACE?.timeEnd('cdsc.compile 2sql'.padEnd(22))
-  if (o.as === 'str') return `\n${sql.join('\n\n')}\n`
-  return sql
+  try {
+    let result, next = ()=> result ??= function (){
+      csn = cds.minify(csn)
+      const o = cdsc._options.for.sql(_o) //> used twice below...
+      const all = cdsc.to.sql(csn,o) .map (each => each.replace(/^-- .+\n/,''))  //> strip comments
+      const sql = unfold_ddl(all, csn, o)
+      TRACE?.timeEnd('cdsc.compile 2sql'.padEnd(22))
+      if (o.as === 'str') return `\n${sql.join('\n\n')}\n`
+      return sql
+    }()
+    cds.emit ('compile.to.dbx', csn, _o, next)
+    return result ??= next() //> in case no handler called next
+  }
+  finally { TRACE?.timeEnd('cds.compile 2sql'.padEnd(22)) }
 }
 
 function cds_compile_to_hdbtable (csn,o) {
@@ -23,7 +30,7 @@ function cds_compile_to_hdbtable (csn,o) {
 
 function cds_compile_to_hana(csn, o, beforeCsn) {
   return require('./hana')(cds.minify(csn), o, beforeCsn)
-} 
+}
 
 function cds_compile_to_deltaSql (csn, o, beforeCsn) {
   const options = cdsc._options.for.sql(o)

package/lib/core/linked-csn.js

@@ -13,9 +13,10 @@ const _kinds = {
 
 class LinkedCSN {
 
-  constructor(x) {
+  constructor (x,...etc) {
 
-    if (typeof x === 'string') x = require('../index').compile(x) //> for convenience in repl
+    if (x.raw) x = require('../index').compile(String.raw(x,...etc)) //> for convenience in repl
+    else if (typeof x === 'string') x = require('../index').compile(x) //> for convenience in repl
     const defs = x.definitions = _iterable (x.definitions||{})
     for (let d in defs) _link (defs[d],d)
     return Object.setPrototypeOf (x, new.target.prototype)
@@ -124,7 +125,7 @@ class LinkedCSN {
 const _iterable = defs => defs && Object.setPrototypeOf (defs, LinkedDefinitions.prototype)
 const _unresolved = (x, unknown = types.any) => ({ name:x, __proto__:unknown, _unresolved:true })
 const _builtin = x => types[x] || x.startsWith?.('cds.hana.') && types.any
-const _infer = require('../ql/infer')
+const _infer = require('../ql/cds.ql-infer')
 const _set = (o,p,v,e=false) => Object.defineProperty (o,p,{ value:v, enumerable:e, configurable:1, writable:1 })
 const _own = (o,p) => { const pd = Reflect.getOwnPropertyDescriptor(o,p); return pd && pd.value }
 const _is = x => {
@@ -140,4 +141,9 @@ any.prototype.set('is_linked', true)
 
 
 /** @returns {LinkedCSN} */
-module.exports = Object.assign (x => x.is_linked ? x : new LinkedCSN (x), { LinkedCSN, LinkedDefinitions, types, classes })
+const cds_linked = x => !x || x.is_linked ? x : new LinkedCSN (x)
+
+module.exports = Object.assign (cds_linked, {
+  LinkedCSN, LinkedDefinitions,
+  types, classes
+})

package/lib/dbs/cds-deploy.js

@@ -7,7 +7,7 @@ const TRACE = cds.debug('trace')
 /** Fluent API: cds.deploy(model).to(db) */
 const deploy = module.exports = function cds_deploy (model, options, csvs) {
 
-  return { async to (/** @type {import('../../lib/srv/srv-api')} */ db, o = options||{}) {
+  return { async to (/** @type {import('../srv/cds.ServiceClient')} */ db, o = options||{}) {
     /* eslint-disable no-console */
 
     // prepare logging
@@ -37,7 +37,7 @@ const deploy = module.exports = function cds_deploy (model, options, csvs) {
       const _run = fn => o.dry ? fn(db) : db.run(fn)
       await _run (async tx => {
         let any = await deploy.schema (tx, model, o)
-        if (any || csvs) await deploy.data (tx, model, o, csvs, file => LOG?.(GREY, ' > init from', local(file), RESET))
+        if ((any || csvs) && !o.dry) await deploy.data (tx, model, o, csvs, file => LOG?.(GREY, ' > init from', local(file), RESET))
       })
       LOG?.('/> successfully deployed to', descr, '\n')
     } catch (e) {

package/lib/env/cds-env.js

@@ -1,7 +1,7 @@
 const { isdir, isfile, fs, path } = require('../utils/cds-utils')
 const DEFAULTS = require('./defaults'), defaults = require.resolve ('./defaults')
 const compat = require('./compat')
-const serviceBindings = require('./serviceBindings');
+const DEBUG = /\b(y|all|env)\b/.test(process.env.DEBUG) ? console.debug : undefined
 
 
 /**
@@ -48,20 +48,25 @@ class Config {
     if (_context === 'cds' && _defaults)  compat (this)
     if (!_home)  return
 
-    // Fill-in process.env from .env files...
-    this._add_to_process_env (_home, 'default-env.json')
-    if (this._profiles.has('development')) this._add_to_process_env (_home, '.env')
-
-    // Read config sources in defined order
-    const sources = this.sources(_home, _context)
-    for (let { path:dir, file, mapper = x=>x } of sources) {
-      let src = path.join(dir,file)
-      let json = _readJson(src,{paths:[_home]}); if (!json) continue
-      if (json.dependencies?.['@sap/cds-mtx']) {
-        console.error('@sap/cds-mtx is not supported by @sap/cds >= 7. Please upgrade to @sap/cds-mtxs following the migration guide on https://cap.cloud.sap/docs/guides/multitenancy/old-mtx-migration.')
-        process.exit(1)
+    // Read config sources in reverse order of precedence -> last one wins
+    if (_context !== 'cds') {
+      this.#import (_home,'package.json', { get: p => p[_context] })
+    } else {
+      for (let {impl} of Object.values(this.plugins)) {
+        const _plugin = path.dirname(impl)
+        this.#import (_plugin,'.cdsrc.yaml', { load: _readYaml })
+        this.#import (_plugin,'.cdsrc.json')
+        this.#import (_plugin,'.cdsrc.js')
+        this.#import (_plugin,'package.json', { get: p => p.cds })
       }
-      this.add (mapper(json), src)
+      const user_ = process.env.CDS_USER_HOME || require('os').homedir()
+      this.#import (user_,'.cdsrc.json')
+      this.#import (user_,'.cdsrc.js')
+      this.#import (_home,'.cdsrc.yaml', { load: _readYaml })
+      this.#import (_home,'.cdsrc.json')
+      this.#import (_home,'.cdsrc.js')
+      this.#import (_home,'package.json', { get: _ext_package_json })
+      this.#import (_home,'.cdsrc-private.json')
     }
 
     // Apply important (!) profiles from config sources
@@ -69,7 +74,7 @@ class Config {
     delete this._profiles._important
 
     // Add process env before linking to allow things like CDS_requires_db=sql
-    this._add_process_env(_context, _home)
+    this._add_process_env()
 
     // Link cds.requires services to cds.requires.kinds
     this._link_required_services()
@@ -93,31 +98,21 @@ class Config {
     }
   }
 
-  /**
-   * Get configuration sources
-   * @param {string} home Project home
-   * @param {string} context configuration context literal
-   */
-  sources (home, context = 'cds') {
-    if (!home) throw new Error('Missing parameter "home".')
-    if (context !== 'cds') return [
-      { path: home, file: 'package.json', mapper: x => x[context] },
-    ]
-    const user_home = process.env.CDS_USER_HOME || require('os').homedir()
-    return [
-      ...Object.keys(this.plugins).map (root => ({
-        path: root, file: 'package.json', mapper: x => x.cds
-      })),
-      { path: user_home, file: '.cdsrc.json', mapper: x => x.cds||x },
-      { path: home, file: '.cdsrc.json', mapper: x => x.cds||x },
-      { path: home, file: 'package.json', mapper: _package_json },
-      { path: home, file: '.cdsrc-private.json', mapper: x => x.cds||x },
-    ]
-    function _package_json (pkg) { // fill cds.extends from .extends
-      let cds = pkg.cds
-      if (pkg.extends) (cds??={}).extends = pkg.extends
-      return cds
-    }
+
+  #import (dir, file, etc) {
+    let conf = this.load (dir, file, etc)
+    if (conf) this.add (conf)
+  }
+
+
+  load (dir, file, { load=_readJson, get = x => x.cds||x } = {}) {
+    file = path.join (dir, file)
+    DEBUG?.('[cds.env] - checking', {file})
+    let cont = load(file); if (!cont) return
+    let conf = get(cont); if (!conf) return
+    DEBUG?.('[cds.env] - importing', file)
+    this._sources.push (file)
+    return conf
   }
 
 
@@ -194,25 +189,25 @@ class Config {
   //    The following are internal APIs which can always change!
   //
 
-  _add_to_process_env (cwd, filename) {
-    const file = path.resolve (cwd,filename)
-    try {
-      const all = require('../compile/etc/properties').read(file); if (!all) return
-      for (const key in all) {
-        if (key in process.env) continue // do not change existing env vars
-        const val = all[key]
-        process.env[key] = typeof val === 'string' ? val : JSON.stringify(val)
-      }
-      this._sources.push (file)
-    } catch (e) {
-      if (e instanceof SyntaxError)  console.error(`Error parsing '${file}': ${e.message}`)
-      else if (e.code !== 'MODULE_NOT_FOUND')  console.error(e.message)
+  _add_to_env (filename, env = process.env) {
+    const _env = this.load (this._home, filename, { load: _readEnv })
+    for (const key in _env) {
+      if (key in env) continue // do not change existing env vars
+      const val = _env[key]
+      env[key] = typeof val === 'string' ? val : JSON.stringify(val)
     }
   }
 
-
-  _add_process_env (prefix, basePath) {
+  _add_process_env() {
+    const prefix = this._context, cwd = this._home
     const {env} = process
+    if (this._profiles.has('development')) {
+      this._add_to_env ('default-env.json', env)
+      for (let each of this._profiles)
+        each === 'development' || this._add_to_env (`.${each}.env`, env)
+      this._add_to_env ('.env', env)
+    }
+
     const PREF = prefix.toUpperCase(), my = { CONFIG: PREF+'_CONFIG', ENV: PREF+'_ENV' }
     let config
 
@@ -224,7 +219,7 @@ class Config {
       // CDS_CONFIG=/path/to/config.json *OR* CDS_CONFIG=/path/to/config/dir
       if (typeof val === "string") {
         // Load from JSON file or directory; No profile support!
-        if (basePath && !path.isAbsolute(val)) val = path.join(basePath, val)
+        if (cwd && !path.isAbsolute(val)) val = path.join(cwd, val)
         const json = _readJson(val) || _readFromDir(val)
         if (json) this.add (json, val, false)
       }
@@ -246,7 +241,7 @@ class Config {
       o[next] = _value4(env[p])
     }
 
-    this.add(config, 'process.env')
+    if (Object.keys(config).length)  this.add (config, 'process.env')
   }
 
   _link_required_services () {
@@ -312,7 +307,7 @@ class Config {
     }
 
     if (!bindings && SERVICE_BINDING_ROOT) {
-      bindings = serviceBindings(SERVICE_BINDING_ROOT)
+      bindings = require('./serviceBindings')(SERVICE_BINDING_ROOT)
       bindingsSource = SERVICE_BINDING_ROOT
     }
 
@@ -435,7 +430,7 @@ class Config {
  */
 function _add_static_profiles (_home, profiles) {
   for (let src of ['package.json', '.cdsrc.json']) try {
-    const conf = require(path.join(_home,src))
+  const conf = require(path.join(_home,src))
     const cds = src === 'package.json' ? conf.cds : conf.cds||conf
     if (cds?.profiles) return profiles.push(...cds.profiles)
     if (cds?.profile) return profiles.push(cds.profile)
@@ -495,17 +490,26 @@ function _value4 (val) {
   return val
 }
 
-function _readJson (file, _options) {
-  try {
-    const src = fs.readFileSync (require.resolve(file,_options))
-    return JSON.parse (src)
-  } catch (e) {
-    if (e instanceof SyntaxError)  console.error(`Error parsing '${file}': ${e.message}`)
-    else if (e.code !== 'MODULE_NOT_FOUND')  console.error(e.message)
+function _readJson (file) {
+  if (isfile(file)) {
+    if (file.endsWith('.js')) return require (file)
+    try { return JSON.parse (fs.readFileSync(file,'utf-8')) } catch (e) { console.error(e) }
   }
 }
 
+function _readYaml (file) {
+  if (isfile(file)) {
+    const YAML = _readYaml.parser ??= require('../compile/etc/yaml')
+    return YAML.parse (fs.readFileSync(file,'utf-8'))
+  }
+}
 
+function _readEnv (file) {
+  if (isfile(file)) {
+    const ENV = _readEnv.parser = require('../compile/etc/properties')
+    return ENV.parse (fs.readFileSync(file,'utf-8'))
+  }
+}
 
 function _readFromDir (p) {
   if (isdir(p)) {
@@ -516,6 +520,12 @@ function _readFromDir (p) {
   return _value4(fs.readFileSync(p, "utf-8"))
 }
 
+// REVISIT: We need to get rid of such hard-coded stuff
+function _ext_package_json (pkg) { // fill cds.extends from .extends
+  let cds = pkg.cds
+  if (pkg.extends) (cds??={}).extends = pkg.extends
+  return cds
+}
 
 
 /** @type Config & typeof DEFAULTS */

package/lib/env/defaults.js

@@ -152,6 +152,7 @@ const defaults = module.exports = {
     /** @deprecated */ for_sqlite: ['de', 'fr'],
     /** @deprecated */ for_sql: ['de', 'fr'],
     /** @deprecated */ fallback_bundle: '',
+    /** @deprecated */ fatjson: true, // REVISIT: remove in cds9
   },
 
   odata: {

package/lib/i18n/bundles.js

@@ -73,7 +73,8 @@ class I18nBundle {
       if (lang in $) return $[locale] = $[lang]       // already cached -> leave method
       else all = this.files.content4 (lang, lang)     // load content for language only
     }
-    const texts = Object.create ((_defaults ?? this.defaults) || Object.prototype)
+    const defaults = (_defaults ?? this.defaults) || Object.prototype
+    const texts = i18n.fatjson ? Object.assign ({},defaults) : Object.create (defaults)
     return $[locale] = $[suffix] = Object.assign (texts, ...all)
   }
 

package/lib/i18n/localize.js

@@ -56,8 +56,8 @@ class Localize {
 
 module.exports = exports = localize
 
-function localize (input) {
-  if (arguments.length > 1) return exports.legacy (...arguments)
+function localize (input,...etc) {
+  if (etc.length) return exports.legacy (input,...etc)
   return new Localize (input)
 }
 

package/lib/index.js

@@ -4,15 +4,18 @@ if (process.env.CDS_STRICT_NODE_VERSION !== 'false') require ('./utils/check-ver
 const { EventEmitter } = require('node:events')
 const cds = module.exports = global.cds = new class cds extends EventEmitter {
 
-  /** @typedef {import('./srv/srv-api.js')} Service */
-  /** @type {import('./core/linked-csn.js')} */ model = undefined
+  /** @typedef {import('./srv/cds.ServiceProvider')} Service */
+  /** @type {import('./core/linked-csn')} */ model = undefined
   /** @type Service */ db = undefined
   /** CLI args */ cli = { command:'', options:{}, argv:[] }
   /** Working dir */ root = process.cwd()
 
-  async emit (eve, ...args) {
-    if (eve === 'served') for (let each of this.listeners(eve)) await each.call(this,...args)
-      else return super.emit (eve, ...args)
+  emit (eve, ...args) {
+    if (eve === 'served') return this.listeners(eve) .reduce (
+      (p,each) => p.then(()=> each.call(this,...args)),
+      Promise.resolve()
+    )
+    else return super.emit (eve, ...args)
   }
 
   // Configuration & Information
@@ -69,7 +72,7 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
   shutdown() { this.app?.server && process.exit() } // is overridden in bin/serve.js
 
   // Core Services API
-  get Service() { return super.Service = require('./srv/srv-api') }
+  get Service() { return super.Service = require('./srv/cds.ServiceProvider') }
   get EventContext() { return super.EventContext = require('./req/context') }
   get Request() { return super.Request = require('./req/request') }
   get Event() { return super.Event = require('./req/event') }
@@ -82,7 +85,7 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
   get DatabaseService() { return super.DatabaseService = require('../libx/_runtime/db/Service.js') }
   get RemoteService() { return super.RemoteService = require('../libx/_runtime/remote/Service.js') }
 
-  /** Contexts and Transactions @type {import('./req/context.js')} */
+  /** Contexts and Transactions @type {import('./req/context')} */
   get context()  { return this._context.getStore() }
   set context(x) { this._context.enterWith(x) }
   get spawn()    { return super.spawn = this._context.spawn }
@@ -98,7 +101,7 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
   clone(x) { return structuredClone(x) }
 
   // Querying and Databases
-  get infer(){ return super.infer = require('./ql/infer') }
+  get infer(){ return super.infer = require('./ql/cds.ql-infer.js') }
   get txs()  { return super.txs = new this.Service('cds.tx') }
   get ql()   { return super.ql = require('./ql/cds-ql') }
   tx         (..._) { return (this.db || this.txs).tx(..._) }
@@ -122,17 +125,20 @@ const cds = module.exports = global.cds = new class cds extends EventEmitter {
 
 // Add global convenience shortcuts for cds.ql and cds.parse commands
 cds.extend (global) .with ( class globals {
-  get SELECT() { return cds.ql.SELECT }
-  get INSERT() { return cds.ql.INSERT }
-  get UPSERT() { return cds.ql.UPSERT }
-  get UPDATE() { return cds.ql.UPDATE }
-  get DELETE() { return cds.ql.DELETE }
-  get CREATE() { return cds.ql.CREATE }
-  get DROP() { return cds.ql.DROP }
-  get CDL() { return cds.parse.CDL }
-  get CQL() { return cds.parse.CQL }
-  get CXL() { return cds.parse.CXL }
+  get SELECT() { return Q('SELECT') }
+  get INSERT() { return Q('INSERT') }
+  get UPSERT() { return Q('UPSERT') }
+  get UPDATE() { return Q('UPDATE') }
+  get DELETE() { return Q('DELETE') }
+  /** @deprecated */ get CREATE() { return D('CREATE', '{CREATE} = cds.ql', cds.ql.CREATE) }
+  /** @deprecated */ get DROP() { return D('DROP', '{DROP} = cds.ql', cds.ql.DROP) }
+  /** @deprecated */ get CDL() { return D('CDL', 'cds.parse.cdl', cds.parse.cdl) }
+  /** @deprecated */ get CQL() { return D('CQL', 'cds.parse.cql', cds.parse.cql) }
+  /** @deprecated */ get CXL() { return D('CXL', 'cds.parse.expr', cds.parse.expr) }
 } .prototype )
+function Q (p) { return G (p, cds.ql[p]) }
+function D (old,use,fn) { return G (old, cds.utils.deprecated (fn,{kind:'Global constant',old,use})) }
+function G (p,v) { Object.defineProperty (global, p, { value:v, enumerable:1,configurable:1}); return v }
 
 // Allow for `import cds from '@sap/cds'` without `esModuleInterop` in tsconfig.json
 Object.defineProperties (module.exports, { default: {value:cds}, __esModule: {value:true} })

package/lib/ql/CREATE.js

@@ -1,10 +1,12 @@
-module.exports = class Query extends require('./Query') {
+const Query = require('./cds.ql-Query')
+class CREATE extends Query {
 
-  get kind() { return 'CREATE' }
-  static _api() {
-    return Object.assign((..._) => (new this).entity(..._), {
-      entity: (..._) => (new this).entity(..._),
-    })
+  /** @type import('./cqn').CREATE['CREATE'] */
+  CREATE = {}
+
+  static call = (..._) => (new this).entity(..._)
+  static API = { class:this,
+    entity: (..._) => (new this).entity(..._)
   }
 
   entity (e, elements) {
@@ -23,3 +25,6 @@ module.exports = class Query extends require('./Query') {
 
   get _target_ref(){ return this.CREATE.entity }
 }
+
+/** @type CREATE.API & (...entries:[]) => CREATE */
+module.exports = CREATE.init()

package/lib/ql/DELETE.js

@@ -1,17 +1,17 @@
 const Whereable = require('./Whereable')
+class DELETE extends Whereable {
 
-module.exports = class Query extends Whereable {
+  /** @type import('./cqn').DELETE['DELETE'] */
+  DELETE = {}
 
-  get kind() { return 'DELETE' }
-  static _api() {
-    return Object.assign ((..._) => (new this).from(..._), {
-      from: (..._) => (new this).from(..._),
-    })
+  static call = (..._) => (new this).from(..._)
+  static API = { class:this,
+    from: (..._) => (new this).from(..._)
   }
 
-  from(entity, key) {
-    this.DELETE.from = this._target4 (...arguments) // supporting tts
-    if (key !== undefined) this.byKey(key)
+  from (entity, ...etc) {
+    this.DELETE.from = this._target4 (entity, ...etc) // supporting tts
+    if (!entity.raw && etc.length) this.byKey(etc[0])
     return this
   }
 
@@ -21,3 +21,6 @@ module.exports = class Query extends Whereable {
 
   get _target_ref(){ return this.DELETE.from }
 }
+
+/** @type DELETE.API & (...entries:[]) => DELETE */
+module.exports = DELETE.init()

package/lib/ql/DROP.js

@@ -1,12 +1,16 @@
-module.exports = class Query extends require('./Query') {
-  get kind() { return 'DROP' }
-  static _api() {
-    return Object.assign ((e)  => (new this).entity(e), {
-      entity: (e) => (new this).entity(e),
-      table: (e)  => (new this).table(e),
-      view: (e)   => (new this).view(e),
-    })
+const Query = require('./cds.ql-Query')
+class DROP extends Query {
+
+  /** @type import('./cqn').DROP['DROP'] */
+  DROP = {}
+
+  static call = (..._) => (new this).entity(..._)
+  static API = { class:this,
+    entity: (..._) => (new this).entity(..._),
+    table: (..._) => (new this).table(..._),
+    view: (..._) => (new this).view(..._),
   }
+
   entity(e) {
     this.DROP.entity = this._target4 (e)
     return this
@@ -24,3 +28,6 @@ module.exports = class Query extends require('./Query') {
 
   get _target_ref(){ return this.DROP.entity }
 }
+
+/** @type DROP.API & (...entries:[]) => DROP */
+module.exports = DROP.init()

package/lib/ql/INSERT.js

@@ -1,14 +1,16 @@
-module.exports = class Query extends require('./Query') {
+const Query = require('./cds.ql-Query')
+class INSERT extends Query {
 
-  get kind() { return 'INSERT' }
-  static _api() {
-    return Object.assign ((..._) => (new this).entries(..._), {
-      into: (..._) => (new this).into(..._),
-    })
+  /** @type import('./cqn').INSERT['INSERT'] */
+  INSERT = {}
+
+  static call = (..._) => (new this).entries(..._)
+  static API = { class:this,
+    into: (..._) => (new this).into(..._)
   }
 
   into (entity, ...data) {
-    this._.into = this._target4 (...arguments) // supporting tts
+    this._.into = this._target4 (entity, ...data) // supporting tts
     if (data.length) this.entries(...data)
     return this
   }
@@ -44,18 +46,21 @@ module.exports = class Query extends require('./Query') {
     return this
   }
 
-  /** @deprecated */ as (query) {
-    INSERT_as_SELECT ??= require('../utils').deprecated(()=>{},{old:'INSERT.as(SELECT)', use:'INSERT.entries(SELECT)'})
-    INSERT_as_SELECT()
-    return this.from(query)
-  }
+  /** @deprecated */ as(q) { return this.from(q) }
 
   valueOf() {
     return super.valueOf('INSERT INTO')
   }
 
-  get _target_ref(){ return this._.into }
+  get _target_ref(){ return ( this.INSERT || this.UPSERT ).into }
 }
 
 const is_array = Array.isArray
-let INSERT_as_SELECT
+
+INSERT.prototype.as = require('../utils').deprecated (INSERT.prototype.as, {
+  old:'INSERT.as(SELECT)',
+  use:'INSERT.entries(SELECT)'
+})
+
+/** @type INSERT.API & (...entries:[]) => INSERT */
+module.exports = INSERT.init()