@sap/cds 6.8.3 → 7.0.0

package/libx/_runtime/messaging/enterprise-messaging.js

@@ -27,13 +27,10 @@ const _checkAppURL = appURL => {
     )
 }
 
-const _oldMtx = () => cds.mtx
-const _multitenancyEnabled = () => cds.requires.multitenancy || _oldMtx()
-
 // REVISIT: It's bad to have to rely on the subdomain.
 // For all interactions where we perform the token exchange ourselves,
 // we will be able to use the zoneId instead of the subdomain.
-const _subdomainFromContext = context => context?.http.req?.authInfo?.getSubdomain()
+const _subdomainFromContext = context => context?.http.req?.authInfo?.getSubdomain?.()
 
 class EnterpriseMessaging extends AMQPWebhookMessaging {
   init() {
@@ -41,61 +38,17 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
     return super.init()
   }
 
-  // Needs to be run after `served` event, otherwise `ProvisioningService` might not be available.
-  // REVISIT: We should register the handlers before, otherwise a tenant subscription
-  // immediately after app start won't trigger those handlers.
-  async addMTXHandlers() {
-    const provisioning = await cds.connect.to('ProvisioningService')
-    const tenantPersistence = await cds.connect.to('TenantPersistenceService')
-    tenantPersistence.impl(() => {
-      tenantPersistence.on('createTenant', async (req, next) => {
-        const res = await next()
-        const subdomain = req.data.subscriptionData.subscribedSubdomain
-        const management = await this.getManagement(subdomain).waitUntilReady()
-        await management.deploy()
-        return res
-      })
-    })
-    provisioning.impl(() => {
-      provisioning.on('DELETE', 'tenant', async (req, next) => {
-        const subdomain = req.data.subscribedSubdomain
-        try {
-          const management = await this.getManagement(subdomain).waitUntilReady()
-          await management.undeploy()
-        } catch (error) {
-          this.LOG.error('Failed to delete messaging artifacts for subdomain', subdomain, '(', error, ')')
-        }
-        return next()
-      })
-      provisioning.on('dependencies', async (req, next) => {
-        this.LOG._info && this.LOG.info('Include Enterprise-Messaging as SaaS dependency')
-        const res = await next()
-        const xsappname = this.options.credentials && this.options.credentials.xsappname
-        if (xsappname) {
-          const exists = res.some(d => d.xsappname === xsappname)
-          if (!exists) res.push({ xsappname })
-        }
-        return res
-      })
-    })
-  }
-
   // New mtx based on @sap/cds-mtxs
   async addMTXSHandlers() {
     // REVISIT: Is that tested with MTX services in sidecar?
     const deploymentSrv = await cds.connect.to('cds.xt.DeploymentService')
     const provisioningSrv = await cds.connect.to('cds.xt.SaasProvisioningService')
     deploymentSrv.impl(() => {
-      deploymentSrv.after('subscribe', async (res, req) => {
+      deploymentSrv.after('subscribe', async (_res, req) => {
         const { tenant } = req.data
         let subdomain
-        try {
-          const tenantInfo = await getTenantInfo(tenant) // @sap/cds-mtxs must provide that info
-          subdomain = tenantInfo.subdomain
-        } catch (e) {
-          this.LOG.error("'subscribe' is not yet implemented for @sap/cds-mtxs")
-          throw e
-        }
+        const tenantInfo = await getTenantInfo(tenant)
+        subdomain = tenantInfo.subdomain
         const management = await this.getManagement(subdomain).waitUntilReady()
         await management.deploy()
       })
@@ -103,10 +56,10 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
         const { tenant } = req.data
         let subdomain
         try {
-          const tenantInfo = await getTenantInfo(tenant) // @sap/cds-mtxs must provide that info
+          const tenantInfo = await getTenantInfo(tenant)
           subdomain = tenantInfo.subdomain
         } catch (e) {
-          this.LOG.error("'unsubscribe' is not yet implemented for @sap/cds-mtxs")
+          if (e.status === 404) return // idempotent
           throw e
         }
         try {
@@ -118,7 +71,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
       })
     })
     provisioningSrv.impl(() => {
-      provisioningSrv.on('dependencies', async (req, next) => {
+      provisioningSrv.on('dependencies', async (_req, next) => {
         this.LOG._info && this.LOG.info('Include Enterprise-Messaging as SaaS dependency')
         const res = (await next()) || []
         const xsappname = this.options.credentials?.xsappname
@@ -132,7 +85,7 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
   }
 
   startListening() {
-    const doNotDeploy = _multitenancyEnabled() && !this.options.deployForProvider
+    const doNotDeploy = cds.requires.multitenancy && !this.options.deployForProvider
     if (doNotDeploy) this.LOG._info && this.LOG.info('Skipping deployment of messaging artifacts for provider account')
     super.startListening({ doNotDeploy })
     if (!doNotDeploy && (this._listenToAll || this.subscribedTopics.size)) {
@@ -151,9 +104,8 @@ class EnterpriseMessaging extends AMQPWebhookMessaging {
   async listenToClient(cb) {
     _checkAppURL(this.optionsApp.appURL)
     registerWebhookEndpoints(BASE_PATH, this.queueName, this.LOG, cb)
-    if (_multitenancyEnabled()) {
-      if (_oldMtx()) await this.addMTXHandlers()
-      else await this.addMTXSHandlers()
+    if (cds.requires.multitenancy) {
+      await this.addMTXSHandlers()
       registerDeployEndpoints(BASE_PATH, this.queueName, async (tenantInfo, options) => {
         const result = { queue: this.queueName, succeeded: [], failed: [] }
         await Promise.all(

package/libx/_runtime/messaging/outbox/utils.js

@@ -37,7 +37,7 @@ const hasPersistentOutbox = (srv, tenant) => {
   if (!cds.requires.outbox || cds.requires.outbox.kind !== 'persistent-outbox') return false
   if (srv.options && srv.options.outbox && srv.options.outbox.kind && srv.options.outbox.kind !== 'persistent-outbox')
     return false
-  if ((cds.mtx || cds.requires.multitenancy) && tenant && _isProviderTenant(tenant)) return false // no persistence for provider account
+  if (cds.requires.multitenancy && tenant && _isProviderTenant(tenant)) return false // no persistence for provider account
   return true
 }
 

package/libx/_runtime/remote/Service.js

@@ -7,13 +7,19 @@ const { getKind, run, getDestination, getAdditionalOptions, getReqOptions } = re
 const { formatVal } = require('../../odata/utils')
 const { hasAliasedColumns } = require('./utils/data')
 
-let _cloudSdkConnectivity
+let _cloudSdkConnectivity, _cloudSdkResilience
 const cloudSdkConnectivity = () => {
   if (_cloudSdkConnectivity) return _cloudSdkConnectivity
   // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
   _cloudSdkConnectivity = require('@sap-cloud-sdk/connectivity')
   return _cloudSdkConnectivity
 }
+const cloudSdkResilience = () => {
+  if (_cloudSdkResilience !== undefined) return _cloudSdkResilience
+  // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
+  _cloudSdkResilience = require('@sap-cloud-sdk/resilience')
+  return _cloudSdkResilience
+}
 
 const _isSimpleCqnQuery = q => typeof q === 'object' && q !== null && !Array.isArray(q) && Object.keys(q).length > 0
 
@@ -200,9 +206,15 @@ class RemoteService extends cds.Service {
         getDestination(this.definition?.name ?? this.datasource, this.options.credentials)
       this.path = this.options.credentials.path
 
+      // `requestTimeout` API is kept as it was public
       this.requestTimeout = this.options.credentials.requestTimeout
       if (this.requestTimeout == null) this.requestTimeout = 60000
 
+      // we're using this as an object to allow remote services without the need for Cloud SDK
+      // required for BAS creating remote services only for events
+      // at first request the middlewares are created
+      this._resilienceMiddlewares = {}
+
       // REVISIT: remove cds.env.features.fetch_csrf in next major ^7
       this.csrf = cds.env.features.fetch_csrf ?? this.options.csrf
       this.csrfInBatch = this.options.csrfInBatch
@@ -250,6 +262,13 @@ class RemoteService extends cds.Service {
     }
 
     this.on('*', async (req, next) => {
+      // early validation on first request for use case without remote API
+      // ideally, that's done on bootstrap of the remote service
+      if (typeof this.destination === 'object' && !this.destination.url)
+        throw new Error(`"url" or "destination" property must be configured in "credentials" of "${this.name}".`)
+      if (this._resilienceMiddlewares && !this._resilienceMiddlewares.timeout)
+        this._resilienceMiddlewares.timeout = cloudSdkResilience().timeout(this.requestTimeout)
+
       const { query } = req
       if (!query && !(typeof req.path === 'string')) return next()
 

package/libx/_runtime/remote/utils/client.js

@@ -77,10 +77,6 @@ const cloudSdk = () => {
 }
 
 const getDestination = (name, credentials) => {
-  if (!credentials.url) {
-    throw new Error(`"url" or "destination" property must be configured in "credentials" of "${name}".`)
-  }
-
   // Cloud SDK wants property "queryParameters" but we have documented "queries"
   if (credentials.queries && !credentials.queryParameters) {
     credentials.queryParameters = credentials.queries
@@ -466,7 +462,9 @@ const getReqOptions = (req, query, service) => {
   }
 
   reqOptions.headers = { accept: 'application/json,text/plain' }
-  reqOptions.timeout = service.requestTimeout
+
+  // add resilience middlewares for Cloud SDK
+  reqOptions.middleware = [service._resilienceMiddlewares.timeout]
 
   if (!_hasHeader(req.headers, 'accept-language')) {
     // Forward the locale properties from the original request (including region variants or weight factors),

package/libx/_runtime/sqlite/Service.js

@@ -56,12 +56,12 @@ module.exports = class SQLiteDatabase extends DatabaseService {
      * tx
      */
     this.on(['BEGIN', 'COMMIT', 'ROLLBACK'], function (req) {
+      // REVISIT: better?
+      this.dbc._closed = req.event !== 'BEGIN'
+
       return this._run(this.model, this.dbc, req.event)
     })
 
-    // REVISIT: register only if needed?
-    this.before('COMMIT', this._integrity.performCheck)
-
     /*
      * generic
      */
@@ -79,9 +79,6 @@ module.exports = class SQLiteDatabase extends DatabaseService {
     this.before('READ', '*', convertAssocToOneManaged)
     this.before('READ', '*', localized) // > has to run after rewrite
     this.before('READ', '*', this._virtual)
-
-    // REVISIT: get data to be deleted for integrity check
-    this.before('DELETE', '*', this._integrity.beforeDelete)
   }
 
   _registerOnHandlers() {
@@ -104,6 +101,7 @@ module.exports = class SQLiteDatabase extends DatabaseService {
   getDbUrl(tenant) {
     return this.url4(tenant)
   }
+
   url4(tenant) {
     const credentials = this.options.credentials || this.options || {}
     let dbUrl = credentials.database || credentials.url || credentials.host || ':memory:'

package/libx/_runtime/sqlite/conversion.js

@@ -1,4 +1,4 @@
-const cds = require('../cds')
+const normalizeTimestamp = require('../common/utils/normalizeTimestamp')
 
 const convertToBoolean = boolean => {
   if (boolean === null) return null
@@ -21,9 +21,9 @@ const convertInt64ToString = int64 => {
 const convertToISOTime = value => {
   if (value === null) return value
 
-  if (!value) value = 0
+  if (!value) return normalizeTimestamp(new Date(0))
 
-  return new Date(value).toISOString()
+  return normalizeTimestamp(value)
 }
 
 const convertToISONoMillis = element => {
@@ -44,14 +44,4 @@ const SQLITE_TYPE_CONVERSION_MAP = new Map([
   ['cds.Timestamp', convertToISOTime]
 ])
 
-if (cds.env.features.bigjs) {
-  // eslint-disable-next-line cds/no-missing-dependencies -- needs to be added by app dev
-  const Big = require('big.js')
-  const convertToBig = value => new Big(value)
-
-  SQLITE_TYPE_CONVERSION_MAP.set('cds.Integer64', convertToBig)
-  SQLITE_TYPE_CONVERSION_MAP.set('cds.Int64', convertToBig)
-  SQLITE_TYPE_CONVERSION_MAP.set('cds.Decimal', convertToBig)
-}
-
 module.exports = { SQLITE_TYPE_CONVERSION_MAP }

package/libx/_runtime/sqlite/customBuilder/CustomFunctionBuilder.js

@@ -46,13 +46,16 @@ class CustomFunctionBuilder extends FunctionBuilder {
       default:
         break
     }
-
-    this._outputObj.sql.push(functionName, '(')
-    if (typeof args === 'string') {
-      this._outputObj.sql.push(args, ')')
+    if (functionName === 'INSTR') {
+      super._handleIndexof(args, functionName)
     } else {
-      this._addFunctionArgs(args)
-      this._outputObj.sql.push(')')
+      this._outputObj.sql.push(functionName, '(')
+      if (typeof args === 'string') {
+        this._outputObj.sql.push(args, ')')
+      } else {
+        this._addFunctionArgs(args)
+        this._outputObj.sql.push(')')
+      }
     }
   }
 

package/libx/_runtime/sqlite/customBuilder/CustomUpsertBuilder.js

@@ -2,6 +2,11 @@ const InsertBuilder = require('../../db/sql-builder').InsertBuilder
 const getAnnotatedColumns = require('../../db/sql-builder/annotations')
 
 class CustomUpsertBuilder extends InsertBuilder {
+  constructor(obj, options, csn) {
+    super(obj, options, csn)
+    this._UPSERT = true
+  }
+
   annotatedColumns(entityName, csn) {
     const { updateAnnotatedColumns } = getAnnotatedColumns(entityName, csn)
 
@@ -18,7 +23,7 @@ class CustomUpsertBuilder extends InsertBuilder {
     super.build()
     const csnKeys =
       (this._obj._target ? this._obj._target.keys : this._csn.definitions[this._obj.INSERT.into].keys) || {}
-    const keys = Object.keys(csnKeys).filter(k => !csnKeys[k].isAssociation)
+    const keys = Object.keys(csnKeys).filter(k => !csnKeys[k].isAssociation && k !== 'IsActiveEntity')
     const updates = []
     const columns = this._obj.INSERT.columns || Object.keys(this._obj.INSERT.entries[0])
     if (this.managedCols) {

package/libx/_runtime/sqlite/execute.js

@@ -71,23 +71,9 @@ function executeSelectSQL(dbc, sql, values, isOne, postMapper) {
   return new Promise((resolve, reject) => {
     _exec(dbc, isOne ? 'get' : 'all', sql, values, (err, result) => {
       if (err) return reject(err)
-
-      // REVISIT
-      // .get returns undefined if nothing in db
-      // our coding expects the result to be null if isOne does not return anything
-      // REVISIT: -> we should definitely fix that coding which expects null
-      if (isOne && result === undefined) {
-        result = null
-      }
-
-      try {
-        result = postProcess(result, postMapper)
-        resolve(result)
-      } catch (e) {
-        reject(e)
-      }
+      resolve(result)
     })
-  })
+  }).then(result => postProcess(result, postMapper))
 }
 
 function _processExpand(model, dbc, cqn, user, locale, txTimestamp) {
@@ -162,6 +148,9 @@ const _executeBulkInsertSQL = (dbc, sql, values) =>
     const stmt = _exec(dbc, 'prepare', sql, err => {
       if (err) return reject(err)
 
+      // REVISIT: better?
+      if (dbc._closed) return reject(new Error('Transaction is already closed'))
+
       if (!Array.isArray(values[0])) values = [values]
 
       // guarantee order through counters in closure

package/libx/odata/afterburner.js

@@ -2,6 +2,7 @@ const cds = require('../_runtime/cds')
 
 const { where2obj, resolveFromSelect } = require('../_runtime/common/utils/cqn')
 const { findCsnTargetFor } = require('../_runtime/common/utils/csn')
+const normalizeTimestamp = require('../_runtime/common/utils/normalizeTimestamp')
 
 const _addKeysDeep = (keys, keysCollector, ignoreManagedBacklinks) => {
   for (const keyName in keys) {
@@ -184,6 +185,9 @@ function _convertVal(element, value) {
     case 'cds.Boolean':
       return typeof value === 'string' ? value === 'true' : value
 
+    case 'cds.Timestamp':
+      return normalizeTimestamp(value)
+
     default:
       return value
   }
@@ -395,20 +399,32 @@ function _addKeys(columns, target) {
   }
 }
 
+// remove duplicate * in expand (e.g. expand=*,*)
+function _removeDuplicateAsterix(columns) {
+  let hasExpandStar = false
+  for (let i = columns.length - 1; i > 0; i--) {
+    const column = columns[i]
+    if (!hasExpandStar && !column.ref && column?.expand?.[0] === '*') hasExpandStar = true
+    else if (hasExpandStar && !column.ref && column?.expand[0] === '*') {
+      columns.splice(i, 1)
+    }
+  }
+}
+
 function _processColumns(cqn, target) {
   if (cqn.SELECT.from.SELECT) _processColumns(cqn.SELECT.from, target)
 
-  const columns = cqn.SELECT.columns
+  let columns = cqn.SELECT.columns
 
   // REVISIT Keys should be added only in case of odata, not e.g. rest.
   // Currently odata is detected via odata_new_parser flag -> find a better indicator.
-  if (columns && !cqn.SELECT.groupBy && cds.env.features.odata_new_parser) {
+  if (columns && !cqn.SELECT.groupBy) {
     let entity
     if (target.kind === 'entity') entity = target
     else if (target.kind === 'action' && target.returns?.kind === 'entity') entity = target.returns
     if (!entity) return
-
-    _addKeys(columns, entity)
+    _removeDuplicateAsterix(columns)
+    if (cds.env.features.odata_new_parser) _addKeys(columns, entity)
   }
 
   if (!Array.isArray(columns)) return
@@ -514,7 +530,7 @@ function _4service(service) {
 
     // REVISIT: better
     // set target (csn definition) for later retrieval
-    cqn.__target = current
+    cqn.__target = current.parent?.kind === 'entity' ? `${current.parent.name}:$:${current.name}` : current.name
 
     // target <=> endpoint entity, all navigation refs must be resolvable accordingly
     if (cds.env.effective.odata.structs) _resolveAliasesInNavigation(cqn, target)
@@ -522,7 +538,7 @@ function _4service(service) {
     /*
      * add default aggregation function (and alias)
      */
-    _processColumns(cqn, cqn.__target)
+    _processColumns(cqn, current)
 
     return cqn
   }

package/libx/odata/grammar.pegjs

@@ -656,6 +656,8 @@
 
   val
     = val:(bool / date) {return {val}}
+    / val:time {return {val}}
+    / val:date {return {val}}
     / val:guid {return {val}}
     / val:number {return typeof val === 'number' ? {val} : { val, literal:'number' }}
     / val:string {return {val}}
@@ -846,6 +848,9 @@
   word "a string"
     = $([^ \t\n()"&;]+)
 
+  time "a time"
+    = $([0-9][0-9]":"[0-9][0-9]":"[0-9][0-9])
+
   date "a date"
     = s:$( [0-9]+"-"[0-9][0-9]"-"[0-9][0-9] // date
       ( "T"[0-9][0-9]":"[0-9][0-9](":"[0-9][0-9]("."[0-9]+)?)? // time
@@ -867,7 +872,7 @@
     = s:$( [+-]? [0-9]+ ) { return parseInt(s) }
 
   identifier "an identifier"
-    = !bool !guid s:$([_a-zA-Z][_a-zA-Z0-9"."]*) { return s }
+    = !bool !guid s:$([_a-zA-Z][_a-zA-Z0-9"."\u0041-\u005A\u0061-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]*) { return s }
 
   guid "a guid"
     = $( hex16 hex16 "-"? hex16 "-"? hex16 "-"? hex16 "-"? hex16 hex16 hex16 )