@sap/cds-dk 10.0.6 → 10.1.0

package/node_modules/ws/lib/permessage-deflate.js

@@ -167,7 +167,9 @@ class PerMessageDeflate {
             (typeof opts.serverMaxWindowBits === 'number' &&
               opts.serverMaxWindowBits > params.server_max_window_bits))) ||
         (typeof opts.clientMaxWindowBits === 'number' &&
-          !params.client_max_window_bits)
+          (typeof params.client_max_window_bits === 'number'
+            ? opts.clientMaxWindowBits > params.client_max_window_bits
+            : !params.client_max_window_bits))
       ) {
         return false;
       }

package/node_modules/ws/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ws",
-  "version": "8.21.1",
+  "version": "8.21.3",
   "description": "Simple to use, blazing fast and thoroughly tested websocket client and server for Node.js",
   "keywords": [
     "HyBi",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds-dk",
-  "version": "10.0.6",
+  "version": "10.1.0",
   "description": "Command line client and development toolkit for the SAP Cloud Application Programming Model",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [
@@ -17,13 +17,13 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@cap-js/asyncapi": "^1.0.0",
+    "@cap-js/asyncapi": "^1.1.0",
     "@cap-js/openapi": "^1.0.0",
     "@cap-js/sqlite": "^3",
-    "@sap/cds": ">=9",
-    "@sap/cds-mtxs": ">=3",
+    "@sap/cds": "^10",
+    "@sap/cds-mtxs": "4.0.3",
     "@sap/hdi-deploy": "^5",
-    "express": "^4.22.1 || ^5",
+    "express": "^5",
     "hdb": "^2.0.0",
     "livereload-js": "^4.0.1",
     "mustache": "^4.0.1",

package/bin/completion/scripts/cds-bash.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-CDS_COMMAND="cds"
-
-_completeCds()
-{
-    local current options previous
-    COMPREPLY=()
-    current="${COMP_WORDS[COMP_CWORD]}"
-    previous="${COMP_WORDS[COMP_CWORD - 1]}"
-
-    # double quoting needed to avoid word 'h' to be recognized as command shortcut 'help'
-    options=$($CDS_COMMAND completion --shell bash --prev "'$previous'" --curr "'$current'" --line "'${COMP_WORDS[*]}'")
-
-    COMPREPLY=( $(compgen -W "${options}" -- ${current}) )
-    compopt -o nosort -o nospace
-    return 0
-}
-
-complete -F _completeCds $CDS_COMMAND

package/bin/completion/scripts/cds-fish.fish

@@ -1,13 +0,0 @@
-#!/bin/fish
-
-set CDS_COMMAND "cds"
-function _completeCds
-    set -l line (commandline -cp)
-    set -l words (string split " " -- $line)
-
-    # double quoting needed to avoid word 'h' to be recognized as command shortcut 'help'
-    echo ($CDS_COMMAND completion --shell fish --prev "'$words[-2]'" --curr "'$words[-1]'" --line "'$line'")
-end
-
-# split into string array so result is not interpreted as single string
-complete -c $CDS_COMMAND --no-files --keep-order --arguments "(_completeCds | string split ' ')"

package/bin/completion/scripts/cds-ps.ps1

@@ -1,19 +0,0 @@
-$COMMAND = "cds"
-
-Register-ArgumentCompleter -Native -CommandName $COMMAND -ScriptBlock {
-    param($wordToComplete, $commandAst, $cursorPosition)
-
-    $cmdSegments = $commandAst.CommandElements
-    $idx = $cmdSegments.IndexOf(($cmdSegments | Where-Object { $_.Extent.Text -eq $wordToComplete }))
-    if ($idx -gt 0) {
-        $previousWord = $cmdSegments[$idx - 1].Extent.Text
-    } else {
-        $previousWord = $cmdSegments[$cmdSegments.Count - 1].Extent.Text
-    }
-
-    # double quoting needed to avoid word 'h' to be recognized as command shortcut 'help'
-    $options = & $COMMAND completion --shell ps --prev "'$previousWord'" --curr "'$wordToComplete'" --line "'$commandAst'"
-    foreach ($option in $options) {
-        [System.Management.Automation.CompletionResult]::new($option, $option, 'ParameterValue', $option)
-    }
-}

package/bin/completion/scripts/cds-zsh.sh

@@ -1,13 +0,0 @@
-#!/bin/zsh
-
-# compinit is required but added to ~/.zshrc so user can remove it if it is already loaded
-# autoload -Uz compinit && compinit
-
-CDS_COMMAND="cds"
-
-_completeCds() {
-    # double quoting needed to avoid word 'h' to be recognized as command shortcut 'help'
-    compadd -S '' -V 'force no sort' -- `${CDS_COMMAND} completion --shell zsh --prev "'${words[CURRENT-1]}'" --curr "'${words[CURRENT]}'" --line "'${words}'"`
-}
-
-compdef _completeCds ${CDS_COMMAND}

package/lib/deploy/index.js

@@ -1,25 +0,0 @@
-module.exports = {
-    options:  /** @type{const} */([
-        '--to',
-        '--for',
-        '--out',
-        '--on',
-        '--tunnel-address',
-        '--vcap-file',
-        '--delta-from'
-    ]),
-    flags:  /** @type{const} */([
-        '--resolve-bindings',
-        '--no-save',
-        '--auto-undeploy',
-        '--dry',
-        '--xdry',
-        '--with-mocks',
-        '--store-credentials',
-        '--no-build',
-        '--model-only',
-        '--script',
-        '--with-auto-schema-evolution'
-    ]),
-    shortcuts: ['-2', '-4', '-o', '-n', '', '', '', '-b']
-}

package/lib/import/asyncapi/importAsyncAPI.js

@@ -1,33 +0,0 @@
-const ParserContext = require("./parserContext");
-const cdsDkVersion = require("../../../package.json").version;
-
-function importAsyncAPI(input) {
-     const context = new ParserContext(input);
-     return convertToCSN(context);
-}
-
-function convertToCSN(context) {
-     const csn = {
-          meta: {
-               creator: `cds-dk ${cdsDkVersion}`
-          },
-          $version: '2.0',
-          definitions: {}
-     };
-
-     Object.entries(context.services).forEach(([key, value]) => {
-          const events = value.events;
-          const types = value.types;
-          delete value.events;
-          delete value.types;
-
-          csn.definitions[key] = value;
-          Object.assign(csn.definitions, events, types);
-     });
-
-     return csn;
-}
-
-module.exports = {
-     importAsyncAPI
-}

package/lib/import/asyncapi/index.js

@@ -1,18 +0,0 @@
-const { importAsyncAPI } = require("./importAsyncAPI");
-const { validateAsyncAPI } = require('./utils');
-
-/**
- * The starting function for conversion of AsyncAPI document to csn
- * @returns AsyncAPI document
- */ 
-function asyncapi2csn(source) {
-    // validate asyncapi document
-    const content = JSON.parse(source);
-    validateAsyncAPI(content);
-
-    return importAsyncAPI(content);
-}
-
-module.exports = {
-    asyncapi2csn
-}

package/lib/import/asyncapi/parserContext.js

@@ -1,372 +0,0 @@
-const { getRegExpGroups } = require('./utils');
-const messages = require("../message").getMessages();
-
-module.exports = class ParserContext {
-    /**
-     * @constructor
-     */
-    constructor(content) {
-        this.services = this.getServicesFromContent(content);
-    }
-
-    getTopicName(eventName) {
-        return eventName.startsWith('ce/') ? eventName.substring(3) : eventName;
-    }
-
-    getEventName(messageRefString) {
-        const lastSlashIndex = messageRefString.lastIndexOf('/');
-        return lastSlashIndex == -1 ? '' : messageRefString.substring(lastSlashIndex + 1);
-    }
-
-    /**
-     * Returns services from the asyncapi json object along with the events and annotations.
-     * @returns an object with all the services.
-     */
-    getServicesFromContent(content) {
-        const services = {};
-        const serviceAnnotations = this.getServiceAnnotations(content);
-
-        Object.entries(content.components.messages).forEach(([, value]) => {
-            let eventName;
-            // Message name should be used to capture the event name
-            if (value.name) {
-                eventName = value.name;
-            } else {
-                throw new Error(messages.INVALID_ASYNCAPI_FILE);
-            }
-            // uses regex to break event name in different components
-            const regExpGroups = getRegExpGroups(eventName);
-            const service = regExpGroups[1] + "." + regExpGroups[2];
-            const event = regExpGroups[0];
-
-            // add service to services entry if not present
-            if (!(service in services)) {
-                services[service] = { 'kind': 'service', '@cds.external': 'true', ...serviceAnnotations, 'events': {}, 'types': {} };
-            }
-
-            // add event entry to service
-            const eventAnnotations = this.getEventAnnotations(value);
-
-            // add topic annotation
-            eventAnnotations['@topic'] = this.getTopicName(eventName);
-            let properties = {};
-            let types = {};
-
-            if (value.payload) {
-                // gets the schema being referred to in the event
-                const eventSchema = this.resolveRef(content, value.payload);
-                [properties, types] = this.getPropertiesAndTypes(event, eventSchema);
-            }
-            services[service].types = types;
-            services[service].events[event] = { 'kind': 'event', '@cds.external': 'true', ...eventAnnotations, elements: properties };
-        });
-
-        return services;
-    }
-
-    /**
-     * Returns annotations of a particular service.
-     * @returns an object with all the annotations as key value pairs.
-     */
-    getServiceAnnotations(content) {
-        const serviceAnnotationsMapping = {
-            'x-sap-stateInfo': 'StateInfo', // expected: object
-            'x-sap-shortText': 'ShortText' // expected: string
-        };
-
-        const infoAnnotationsMapping = {
-            'title': 'Title', // expected: string
-            'version': 'SchemaVersion', // expected: string
-            'description': 'Description' // expected: string
-        };
-
-        const annotations = this.getAnnotations(content, serviceAnnotationsMapping);
-
-        if (content.info) {
-            for (const [key, value] of Object.entries(infoAnnotationsMapping)) {
-                if (content.info[key] && !(content.info[key] instanceof Object)) {
-                    // info values will always be in string format
-                    annotations['@AsyncAPI.' + value] = content.info[key];
-                }
-            }
-        }
-
-        return annotations;
-    }
-
-    /**
-     * Returns annotations of a particular event. Here the parameter content is event content.
-     * @returns an object with all the annotations as key value pairs.
-     */
-    getEventAnnotations(content) {
-        const eventLevelAnnotationsMapping = {
-            'x-sap-event-spec-version': 'EventSpecVersion', // expected: string
-            'x-sap-event-source': 'EventSource', // expected: string
-            'x-sap-event-version': 'EventSchemaVersion', // expected: string
-            'x-sap-event-source-parameters': 'EventSourceParams', // expected: object
-            'x-sap-event-characteristics': 'EventCharacteristics', // expected: object
-            'x-sap-stateInfo': 'EventStateInfo' // expected: object
-        };
-
-        const annotations = this.getAnnotations(content, eventLevelAnnotationsMapping);
-
-        return annotations;
-    }
-
-    /**
-     * Returns validity of the annotation value. Here the parameter
-     * content is the annotation name and value of the annotation.
-     * @returns true/false depending on the annotation value.
-     */
-    isValidAnnotationValue(annotation, value) {
-        const objectTypeAnnotations = ['StateInfo', 'EventSourceParams', 'EventCharacteristics', 'EventStateInfo'];
-        // if the value is an array or null
-        if (Array.isArray(value) || value === null) return false;
-
-        if (objectTypeAnnotations.includes(annotation) && (value instanceof Object)) {
-            return true;
-        } else if ((!objectTypeAnnotations.includes(annotation)) && (typeof value === 'string')) {
-            return true;
-        } else {
-            console.warn(`WARNING: Annotations which are not following the expected type are omitted.`);
-            return false;
-        }
-    }
-
-    /**
-     * Returns annotations for an event/service. Here the parameter content
-     * is event/service content along with the corresponding mapping.
-     * @returns an object with the annotations as key value pairs.
-     */
-    getAnnotations(content, annotationsMapping) {
-        const annotations = {};
-
-        for (const [key, value] of Object.entries(content)) {
-            // case: known annotation
-            if (annotationsMapping[key] && this.isValidAnnotationValue(annotationsMapping[key], value)) {
-                annotations['@AsyncAPI.' + annotationsMapping[key]] = value;
-            }
-            // case: unkown annotation
-            else if (key.startsWith('x-')) {
-                if (!annotations['@AsyncAPI.Extensions']) {
-                    annotations['@AsyncAPI.Extensions'] = {};
-                }
-                // removes x- from the element
-                annotations['@AsyncAPI.Extensions'][key.substring(2)] = value;
-            }
-        }
-
-        return annotations;
-    }
-
-    /**
-     * Returns the referred schema. Here the content is the asyncapi
-     * document and payloadObject is the reference path
-     * @returns an object with the referred schema.
-     */
-    resolveRef(content, payloadObject) {
-        let schema = {};
-
-        if (payloadObject['$ref']) {
-            const pathArray = payloadObject['$ref'].split('/');
-            pathArray.forEach((value) => {
-                if (value === '#') schema = content;
-                else if (schema[value]) schema = schema[value];
-                // in case path doesn't exist in the file
-                else schema = {};
-            });
-
-            if (!Object.keys(schema).length) {
-                console.warn(`WARNING: Unable to resolve ref path: ` + payloadObject['$ref']);
-            }
-        }
-        else if (payloadObject instanceof Object) {
-            // in case ref is not there and schema object is there
-            schema = payloadObject;
-        }
-
-        return schema;
-    }
-
-    /**
-     * Returns the properties and types generated, related to an event.
-     * @returns a properties object and a types object.
-     */
-    getPropertiesAndTypes(eventName, content) {
-        const properties = {};
-        let types = {};
-
-        if (content.properties) {
-            for (const [key, value] of Object.entries(content.properties)) {
-                // will contain type objects generated for a property
-                let referredTypes = {};
-                let isRequired = false;
-                if (content['required']?.includes(key)) isRequired = true;
-                [properties[key], referredTypes] = this.parseProperty(eventName, key, value, isRequired);
-                // collecting all the types
-                types = { ...types, ...referredTypes };
-            }
-        }
-        return [properties, types];
-    }
-
-    /**
-     * Returns the processed objects for property and type.
-     * @returns property object and type object.
-     */
-    parseProperty(eventName, propertyName, propertyContent, isRequired) {
-        let property = {};
-        let propertyAttributes = {};
-        let types = {};
-
-        if (isRequired === true) {
-            property['@mandatory'] = true;
-        }
-
-        let type = this.getTypeFromArray(propertyContent.type);
-
-        // case where type is defined
-        if (type && (type === 'object' || type === 'array')) {
-            // for generation of type: event name + property name
-            propertyName = propertyName[0].toUpperCase() + propertyName.substring(1);
-            let typeName = eventName + "." + propertyName;
-            // generate object for the introduced type
-            const elements = this.getTypeElements(propertyContent);
-            types[typeName] = { 'kind': 'type', '@cds.external': 'true', ...elements };
-            // referring to the generated type from the property
-            propertyAttributes = { 'type': typeName };
-        } else {
-            propertyAttributes = this.getPropertyObject(propertyContent);
-        }
-        property = { ...property, ...propertyAttributes };
-
-        return [property, types];
-    }
-
-    /**
-     * Returns generated type for the property.
-     * @returns an object for a type.
-     */
-    getTypeElements(propertyContent) {
-        let properties = {};
-        let type = this.getTypeFromArray(propertyContent.type);
-
-        // for nested object
-        if (type === 'object') {
-            for (const [key, value] of Object.entries(propertyContent.properties)) {
-                properties[key] = this.getTypeElements(value);
-            }
-        }
-        // for nested array
-        else if (type === 'array') {
-            properties.items = this.getTypeElements(propertyContent.items);
-            return properties;
-        }
-        // base data type mapping
-        else {
-            return this.getPropertyObject(propertyContent);
-        }
-
-        return { elements: properties };
-    }
-
-    /**
-     * Returns type for the property from the AsyncAPI Document.
-     * @returns the value of type.
-     */
-    getTypeFromArray(typeValue) {
-        let type;
-        // if type is an array
-        if (Array.isArray(typeValue)) {
-            // one of the value will be null
-            type = typeValue[0] === 'null' ? typeValue[1] : typeValue[0];
-        } else {
-            type = typeValue;
-        }
-
-        return type;
-    }
-
-    /**
-     * Returns generated object for a single property.
-     * @returns an object for a property.
-     */
-    getPropertyObject(propertyContent) {
-        const property = {};
-        if ('$ref' in propertyContent) {
-            const refPathParts = propertyContent['$ref'].split('/');
-            const propertyName = refPathParts[refPathParts.length - 1];
-            property['type'] = { 'ref': [refPathParts[3], propertyName] };
-            return property;
-        }
-        const inputType = this.getTypeFromArray(propertyContent.type);
-        const cdsType = this.getDataType(inputType, propertyContent.format);
-
-        property['type'] = cdsType;
-
-        // case: cds type is decimal
-        if (cdsType === 'cds.Decimal') {
-            if (propertyContent['x-sap-precision']) property.precision = propertyContent['x-sap-precision'];
-            if (propertyContent['x-sap-scale']) property.scale = propertyContent['x-sap-scale'];
-        }
-
-        if (propertyContent['default']) {
-            property['default'] = { 'val': propertyContent['default'] };
-        }
-
-        if (propertyContent['enum']) {
-            property['enum'] = this.getEnumObject(propertyContent['enum']);
-        }
-
-        return property;
-    }
-
-    /**
-     * Takes the enums from the AsyncAPI Document.
-     * @returns the property object of enums.
-     */
-    getEnumObject(enumArray) {
-        const enumProperty = {};
-
-        enumArray.forEach(val => {
-            enumProperty[val] = {};
-        });
-
-        return enumProperty;
-    }
-
-    /**
-     * Takes the type and format from the document and returns the corresponding cds type.
-     * @returns the corresponding cds type.
-     */
-    getDataType(type, format = null) {
-        const asyncapiToCdsMapping = {
-            'number': 'cds.Double',
-            'boolean': 'cds.Boolean',
-            'integer': 'cds.Integer'
-        };
-
-        if (type === 'string') {
-            switch (format) {
-                case 'int64':
-                    return 'cds.Integer64';
-                case 'decimal':
-                    return 'cds.Decimal';
-                case 'uuid':
-                    return 'cds.UUID';
-                case 'date':
-                    return 'cds.Date';
-                case 'partial-time':
-                    return 'cds.Time';
-                case 'date-time':
-                    return 'cds.Timestamp';
-                default:
-                    return 'cds.LargeString';
-            }
-        } else if (asyncapiToCdsMapping[type]) {
-            return asyncapiToCdsMapping[type];
-        } else {
-            throw new Error(messages.UNRESOLVED_TYPE + `'${type}'`);
-        }
-    }
-}

package/lib/import/asyncapi/utils.js

@@ -1,49 +0,0 @@
-const messages = require("../message").getMessages();
-
-function validateAsyncAPI(content) {
-    if ('channels' in content && 'components' in content && 'messages' in content.components) {
-        return;
-    }
-
-    throw new Error(messages.INVALID_ASYNCAPI_FILE);
-}
-
-/**
- * Accepted scenarios:
- * * with version info : <namespace>.<businessObject>.<operation>.<version>
- * * without version info : <namespace>.<businessObject>.<operation>
- *
- * ? Is it mandatory for <namespace> to always follow small case notation?
- * ? Is it mandatory for <businessObject> to follow Camel Case or Upper Came Case notation?
- * 
- * ToDo: Can we support `-` in operations?
- */
-const regExp = new RegExp(
-    '^(?<namespace>(?:[a-z][a-z0-9]*)(?:[.][a-z][a-z0-9]*)+)[.](?<businessObject>[a-zA-Z0-9]+)[.](?<operation>[a-zA-Z0-9]+)[.]?(?<version>v(?:[0-9]|[1-9][0-9]*))?$'
-);
-
-/**
- * Validates the messages' `key` with the regExp and returns the regEx groups.
- * @returns regexGroups
- */
-function getRegExpGroups(key) {
-    /**
-     * Result format:
-     * index 0: key
-     * index 1: <namespace> value
-     * index 2: <businessObject> value
-     * index 3: <operation> value
-     * index 4: <version> value; undefined if <version> is optional
-     */
-    const regExpGroups = regExp.exec(key);
-
-    if (regExpGroups == null) {
-        throw new Error(messages.INVALID_MESSAGE_NAME);
-    }
-    return regExpGroups;
-}
-
-module.exports = {
-    validateAsyncAPI,
-    getRegExpGroups
-}

package/lib/init/template/nodejs/files/.gitignore.hbs

@@ -1,34 +0,0 @@
-# CAP {{ projectName }}
-_out
-*.db
-*.sqlite
-connection.properties
-default-*.json
-.cdsrc-private.json
-gen/
-node_modules/
-target/
-
-# Web IDE, App Studio
-.che/
-.gen/
-
-# MTA
-*_mta_build_tmp
-*.mtar
-mta_archives/
-
-# Other
-.DS_Store
-*.orig
-*.log
-
-*.iml
-*.flattened-pom.xml
-
-# IDEs
-# .vscode
-# .idea
-
-# @cap-js/cds-typer
-@cds-models