docs: update changelogs for release

ci: publish release

backend/backend/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @openstapps/backend
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/core-tools@3.3.2
+
+## 3.3.1
+
+### Patch Changes
+
+- 67ab1fd6: fix for geo.point mapping
+
 ## 3.3.0
 
 ### Minor Changes

backend/backend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/backend",
   "description": "A reference implementation for a StApps backend",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "private": true,
   "type": "module",
   "license": "AGPL-3.0-only",

backend/backend/src/storage/elasticsearch/query/filters/distance.ts

@@ -25,7 +25,7 @@ export function buildDistanceFilter(
 ): QueryDslSpecificQueryContainer<'geo_distance'> {
   const geoObject: QueryDslGeoDistanceQuery = {
     distance: `${filter.arguments.distance}m`,
-    [`${filter.arguments.field}.point.coordinates`]: {
+    [`${filter.arguments.field}.point`]: {
       lat: filter.arguments.position[1],
       lon: filter.arguments.position[0],
     },

backend/backend/src/storage/elasticsearch/query/sort/distance.ts

@@ -25,7 +25,7 @@ export function buildDistanceSort(sort: SCDistanceSort): SortOptions {
       mode: 'avg',
       order: sort.order,
       unit: 'm',
-      [`${sort.arguments.field}.point.coordinates`]: {
+      [`${sort.arguments.field}.point`]: {
         lat: sort.arguments.position[1],
         lon: sort.arguments.position[0],
       },

backend/backend/test/storage/elasticsearch/query.spec.ts

@@ -466,7 +466,7 @@ describe('Query', function () {
       const expectedFilter: QueryDslSpecificQueryContainer<'geo_distance'> = {
         geo_distance: {
           'distance': '1000m',
-          'geo.point.coordinates': {
+          'geo.point': {
             lat: 8.123,
             lon: 50.123,
           },
@@ -636,7 +636,7 @@ describe('Query', function () {
           'mode': 'avg',
           'order': 'desc',
           'unit': 'm',
-          'geo.point.coordinates': {
+          'geo.point': {
             lat: 50.123,
             lon: 8.123,
           },

examples/minimal-connector/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @openstapps/minimal-connector
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/api@3.3.2
+
 ## 3.3.0
 
 ### Patch Changes

examples/minimal-connector/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/minimal-connector",
   "description": "This is a minimal connector which serves as an example",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",

examples/minimal-plugin/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @openstapps/minimal-plugin
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/core-tools@3.3.2
+- @openstapps/api-plugin@3.3.2
+- @openstapps/api@3.3.2
+
 ## 3.3.0
 
 ### Patch Changes

examples/minimal-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/minimal-plugin",
   "description": "Minimal Plugin",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "private": true,
   "type": "module",
   "license": "GPL-3.0-only",

frontend/app/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @openstapps/app
 
+## 3.3.2
+
+### Patch Changes
+
+- 7afc24f1: fixed config version comparison
+  - @openstapps/core@3.3.2
+  - @openstapps/api@3.3.2
+
 ## 3.3.0
 
 ### Minor Changes

frontend/app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/app",
   "description": "The generic app tailored to fulfill needs of German universities, written using Ionic Framework.",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "private": true,
   "license": "GPL-3.0-only",
   "author": "Karl-Philipp Wulfert <krlwlfrt@gmail.com>",

frontend/app/src/app/modules/config/config.provider.spec.ts

@@ -132,6 +132,8 @@ describe('ConfigProvider', () => {
     wrongConfig.backend.SCVersion = '0.1.0';
     storageProviderSpy.get.and.returnValue(Promise.resolve(wrongConfig));
     spyOn(configProvider.client, 'handshake').and.returnValue(Promise.resolve(sampleIndexResponse));
+    // sets StApps core version which has a different major version
+    configProvider.scVersion = '1.0.0';
     await configProvider.init();
 
     expect(ngxLogger.warn).toHaveBeenCalledWith(
@@ -139,6 +141,19 @@ describe('ConfigProvider', () => {
     );
   });
 
+  it('should load from storage if offline and same major version stored', async () => {
+    internetConnectionServiceMock = {offline$: new BehaviorSubject<boolean>(true)};
+    storageProviderSpy.has.and.returnValue(Promise.resolve(true));
+    const configInStorage = structuredClone(sampleIndexResponse);
+    configInStorage.backend.SCVersion = '1.0.0';
+    storageProviderSpy.get.and.returnValue(Promise.resolve(configInStorage));
+    // sets StApps core version which has the same major version
+    configProvider.scVersion = '1.1.1';
+    await configProvider.init();
+
+    expect(configProvider.getAnyValue('app')).toEqual(configInStorage.app);
+  });
+
   it('should throw error on saved app configuration not available', async () => {
     storageProviderSpy.has.and.returnValue(Promise.resolve(false));
     // eslint-disable-next-line unicorn/error-message

frontend/app/src/app/modules/config/config.provider.ts

@@ -132,7 +132,7 @@ export class ConfigProvider {
       this.config = await this.loadLocal();
       this.firstSession = false;
       this.logger.log(`initialised configuration from storage`);
-      if (this.config.backend.SCVersion !== this.scVersion) {
+      if (this.config.backend.SCVersion.split('.')[0] !== this.scVersion.split('.')[0]) {
         loadError = new WrongConfigVersionInStorage(this.scVersion, this.config.backend.SCVersion);
       }
     } catch (error) {

frontend/app/src/app/modules/data/list/data-list-item.scss

@@ -33,9 +33,9 @@ ion-item {
   margin: var(--spacing-sm);
 
   ion-thumbnail {
-    --ion-margin: var(--spacing-xs);
+    --size: 36px;
 
-    margin-block: auto;
+    margin: 0;
     margin-inline: var(--spacing-md);
     padding: 0;
   }

frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.component.ts

@@ -14,7 +14,7 @@
  */
 
 import {Component, EventEmitter, Input, Output} from '@angular/core';
-import {DocumentAction, PAIADocument, PAIADocumentStatus} from '../../../types';
+import {DocumentAction, PAIADocument, PAIADocumentStatus, PAIADocumentVisualStatus} from '../../../types';
 import {LibraryAccountService} from '../../library-account.service';
 
 @Component({
@@ -27,12 +27,15 @@ export class PAIAItemComponent {
 
   renewable: boolean;
 
+  visualStatus?: PAIADocumentVisualStatus;
+
   constructor(private readonly libraryAccountService: LibraryAccountService) {}
 
   @Input()
   set item(value: PAIADocument) {
     this._item = value;
     void this.setRenewable();
+    this.visualStatus = this.getVisualStatus(Number(this.item.status));
   }
 
   get item(): PAIADocument {
@@ -56,4 +59,18 @@ export class PAIAItemComponent {
     const isActive = await this.libraryAccountService.isActivePatron();
     this.renewable = isActive && Number(this.item.status) === PAIADocumentStatus.Held;
   }
+
+  private getVisualStatus(status: PAIADocumentStatus): PAIADocumentVisualStatus | undefined {
+    switch (status) {
+      case PAIADocumentStatus.Ordered: {
+        return {color: 'warning', status: status, statusText: 'ordered'};
+      }
+      case PAIADocumentStatus.Provided: {
+        return {color: 'success', status: status, statusText: 'ready'};
+      }
+      default: {
+        return undefined;
+      }
+    }
+  }
 }

frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.html

@@ -14,10 +14,16 @@
 -->
 
 <ion-item>
-  <!-- TODO: text not selectable in Chrome, bugfix needed https://github.com/ionic-team/ionic-framework/issues/24956 -->
   <ion-label class="ion-text-wrap">
     @if (item.about) {
-      <h2 class="name">{{ item.about }}</h2>
+      <h2 class="name">
+        @if (visualStatus) {
+          <ion-badge [color]="visualStatus.color" slot="start">
+            {{ 'library.account.pages' + '.' + listName + '.' + visualStatus.statusText | translate }}
+          </ion-badge>
+        }
+        {{ item.about }}
+      </h2>
     }
     @for (property of propertiesToShow; track property) {
       @if (item[property]) {

frontend/app/src/app/modules/library/account/elements/paia-item/paiaitem.scss

@@ -12,3 +12,6 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
+ion-badge {
+  vertical-align: bottom;
+}

frontend/app/src/app/modules/library/account/holds/holds-page.html

@@ -35,23 +35,13 @@
       @switch (activeSegment) {
         @case ('orders') {
           @for (hold of paiaDocuments; track hold) {
-            @if (toNumber(hold.status) === paiaDocumentStatus.Provided) {
-              <stapps-paia-item
-                [item]="hold"
-                [propertiesToShow]="['label', 'storage']"
-                (documentAction)="onDocumentAction($event)"
-                listName="holds"
-              >
-              </stapps-paia-item>
-            } @else {
-              <stapps-paia-item
-                [item]="hold"
-                [propertiesToShow]="['label']"
-                (documentAction)="onDocumentAction($event)"
-                listName="holds"
-              >
-              </stapps-paia-item>
-            }
+            <stapps-paia-item
+              [item]="hold"
+              [propertiesToShow]="['label', 'storage']"
+              (documentAction)="onDocumentAction($event)"
+              listName="holds"
+            >
+            </stapps-paia-item>
           }
         }
         @case ('reservations') {

frontend/app/src/app/modules/library/account/profile/profile-page.component.ts

@@ -25,8 +25,6 @@ import {PAIAPatron} from '../../types';
 export class ProfilePageComponent {
   patron?: PAIAPatron;
 
-  propertiesToShow: (keyof PAIAPatron)[] = ['id', 'name', 'email', 'address', 'expires'];
-
   constructor(private readonly libraryAccountService: LibraryAccountService) {}
 
   async ionViewWillEnter(): Promise<void> {

frontend/app/src/app/modules/library/account/profile/profile-page.html

@@ -26,27 +26,45 @@
     <ion-card>
       <ion-card-content>
         <ion-grid>
-          @for (property of propertiesToShow; track property) {
-            @if (patron[property]) {
-              <ion-row>
-                <ion-col>
-                  {{ 'library.account.pages.profile.labels' + '.' + property | translate }}:
-                </ion-col>
-                <ion-col>
-                  @if (!['expires'].includes(property)) {
-                    {{ patron[property] }}
-                  } @else {
-                    @if (isUnlimitedExpiry(patron['expires'])) {
-                      {{ 'library.account.pages.profile.values.unlimited' | translate }}
-                    } @else {
-                      {{ 'library.account.pages.profile.values.expires' | translate }}:&nbsp;{{
-                        patron['expires'] | amDateFormat: 'll'
-                      }}
-                    }
-                  }
-                </ion-col>
-              </ion-row>
-            }
+          <ion-row>
+            <ion-col> {{ 'library.account.pages.profile.labels.id' | translate }}: </ion-col>
+            <ion-col>
+              {{ patron.id }}
+            </ion-col>
+          </ion-row>
+          <ion-row>
+            <ion-col> {{ 'library.account.pages.profile.labels.name' | translate }}: </ion-col>
+            <ion-col> {{ patron.name_details?.title ?? '' }} {{ patron.name }} </ion-col>
+          </ion-row>
+          @if (patron.email) {
+            <ion-row>
+              <ion-col> {{ 'library.account.pages.profile.labels.email' | translate }}: </ion-col>
+              <ion-col>
+                {{ patron.email }}
+              </ion-col>
+            </ion-row>
+          }
+          @if (patron.address) {
+            <ion-row>
+              <ion-col> {{ 'library.account.pages.profile.labels.address' | translate }}: </ion-col>
+              <ion-col>
+                {{ patron.address }}
+              </ion-col>
+            </ion-row>
+          }
+          @if (patron.expires) {
+            <ion-row>
+              <ion-col> {{ 'library.account.pages.profile.labels.expires' | translate }}: </ion-col>
+              <ion-col>
+                @if (isUnlimitedExpiry(patron.expires)) {
+                  {{ 'library.account.pages.profile.values.unlimited' | translate }}
+                } @else {
+                  {{ 'library.account.pages.profile.values.expires' | translate }}:&nbsp;{{
+                    patron.expires | amDateFormat: 'll'
+                  }}
+                }
+              </ion-col>
+            </ion-row>
           }
         </ion-grid>
       </ion-card-content>

frontend/app/src/app/modules/library/types.ts

@@ -22,6 +22,13 @@ export interface PAIAPatron {
   status?: PAIAPatronStatus;
   type?: string;
   note?: string;
+  // HeBIS specific property (not in PAIA documentation)
+  name_details?: {
+    firstname?: string;
+    lastname?: string;
+    gender?: string;
+    title?: string;
+  };
 }
 
 export enum PAIAPatronStatus {
@@ -88,3 +95,9 @@ export interface DocumentAction {
   action: 'cancel' | 'renew';
   doc: PAIADocument;
 }
+
+export interface PAIADocumentVisualStatus {
+  color: 'warning' | 'success';
+  status: PAIADocumentStatus;
+  statusText: 'ordered' | 'ready';
+}

frontend/app/src/assets/i18n/de.json

@@ -336,13 +336,15 @@
             "title": "Titel",
             "about": "Mehr Informationen",
             "label": "Signatur",
-            "starttime": "Übermittelt am",
+            "starttime": "Vorgemerkt am",
             "endtime": "Abzuholen bis",
             "storage": "Abholtheke",
             "queue": "Position in der Warteschlange"
           },
           "holds": "Bestellungen",
-          "reservations": "Vormerkungen"
+          "reservations": "Vormerkungen",
+          "ordered": "Bestellt",
+          "ready": "Abholbereit"
         },
         "checked_out": {
           "title": "Deine Ausleihen",

frontend/app/src/assets/i18n/en.json

@@ -336,13 +336,15 @@
             "title": "Title",
             "about": "More information",
             "label": "Shelfmark",
-            "starttime": "Submitted at",
+            "starttime": "Reserved on",
             "endtime": "Available for pickup until",
-            "storage": "Pick-up counter",
+            "storage": "Pickup counter",
             "queue": "Position in the queue"
           },
           "holds": "orders",
-          "reservations": "reservations"
+          "reservations": "reservations",
+          "ordered": "Ordered",
+          "ready": "Ready for pickup"
         },
         "checked_out": {
           "title": "checked out items",

frontend/app/src/environments/environment.ts

@@ -21,7 +21,7 @@ export const environment = {
   backend_url: 'https://mobile.server.uni-frankfurt.de',
   app_host: 'mobile.app.uni-frankfurt.de',
   custom_url_scheme: 'de.anyschool.app',
-  backend_version: '3.3.0',
+  backend_version: '999.0.0',
   production: false,
 };
 

images/app-builder/Dockerfile

@@ -8,7 +8,7 @@ LABEL version="2.0.0" \
 ### Configure versions to install
 ENV	ANDROID_APIS="android-33" \
   ANDROID_BUILD_TOOLS_VERSION="30.0.2" \
-  NPM_VERSION="^9.0.0" \
+  NPM_VERSION="^10.0.0" \
   IONIC_VERSION="^6.0.0" \
   CORDOVA_RES_VERSION="latest" \
   ### Configure download URLs

images/app-builder/scripts/node_setup.sh

@@ -1,372 +1,108 @@
 #!/bin/bash
 
-# Discussion, issues and change requests at:
-#   https://github.com/nodesource/distributions
-#
-# Script to install the NodeSource Node.js 18.x repo onto a
-# Debian or Ubuntu system.
-#
-# Run as root or insert `sudo -E` before `bash`:
-#
-# curl -sL https://deb.nodesource.com/setup_18.x | bash -
-#   or
-# wget -qO- https://deb.nodesource.com/setup_18.x | bash -
-#
-# CONTRIBUTIONS TO THIS SCRIPT
-#
-# This script is built from a template in
-# https://github.com/nodesource/distributions/tree/master/deb/src
-# please don't submit pull requests against the built scripts.
-#
+# Logger Function
+log() {
+  local message="$1"
+  local type="$2"
+  local timestamp=$(date '+%Y-%m-%d %H:%M:%S')
+  local color
+  local endcolor="\033[0m"
 
+  case "$type" in
+    "info") color="\033[38;5;79m" ;;
+    "success") color="\033[1;32m" ;;
+    "error") color="\033[1;31m" ;;
+    *) color="\033[1;34m" ;;
+  esac
 
-export DEBIAN_FRONTEND=noninteractive
-SCRSUFFIX="_18.x"
-NODENAME="Node.js 18.x"
-NODEREPO="node_18.x"
-NODEPKG="nodejs"
-
-print_status() {
-    echo
-    echo "## $1"
-    echo
+  echo -e "${color}${timestamp} - ${message}${endcolor}"
 }
 
-if test -t 1; then # if terminal
-    ncolors=$(which tput > /dev/null && tput colors) # supports color
-    if test -n "$ncolors" && test $ncolors -ge 8; then
-        termcols=$(tput cols)
-        bold="$(tput bold)"
-        underline="$(tput smul)"
-        standout="$(tput smso)"
-        normal="$(tput sgr0)"
-        black="$(tput setaf 0)"
-        red="$(tput setaf 1)"
-        green="$(tput setaf 2)"
-        yellow="$(tput setaf 3)"
-        blue="$(tput setaf 4)"
-        magenta="$(tput setaf 5)"
-        cyan="$(tput setaf 6)"
-        white="$(tput setaf 7)"
-    fi
-fi
-
-print_bold() {
-    title="$1"
-    text="$2"
-
-    echo
-    echo "${red}================================================================================${normal}"
-    echo "${red}================================================================================${normal}"
-    echo
-    echo -e "  ${bold}${yellow}${title}${normal}"
-    echo
-    echo -en "  ${text}"
-    echo
-    echo "${red}================================================================================${normal}"
-    echo "${red}================================================================================${normal}"
+# Error handler function
+handle_error() {
+  local exit_code=$1
+  local error_message="$2"
+  log "Error: $error_message (Exit Code: $exit_code)" "error"
+  exit $exit_code
 }
 
-bail() {
-    echo 'Error executing command, exiting'
-    exit 1
+# Function to check for command availability
+command_exists() {
+  command -v "$1" &> /dev/null
 }
 
-exec_cmd_nobail() {
-    echo "+ $1"
-    bash -c "$1"
-}
-
-exec_cmd() {
-    exec_cmd_nobail "$1" || bail
-}
-
-node_deprecation_warning() {
-    if [[ "X${NODENAME}" == "Xio.js 1.x" ||
-          "X${NODENAME}" == "Xio.js 2.x" ||
-          "X${NODENAME}" == "Xio.js 3.x" ||
-          "X${NODENAME}" == "XNode.js 0.10" ||
-          "X${NODENAME}" == "XNode.js 0.12" ||
-          "X${NODENAME}" == "XNode.js 4.x LTS Argon" ||
-          "X${NODENAME}" == "XNode.js 5.x" ||
-          "X${NODENAME}" == "XNode.js 6.x LTS Boron" ||
-          "X${NODENAME}" == "XNode.js 7.x" ||
-          "X${NODENAME}" == "XNode.js 8.x LTS Carbon" ||
-          "X${NODENAME}" == "XNode.js 9.x" ||
-          "X${NODENAME}" == "XNode.js 10.x" ||
-          "X${NODENAME}" == "XNode.js 11.x" || 
-          "X${NODENAME}" == "XNode.js 12.x" ||
-          "X${NODENAME}" == "XNode.js 13.x" ||
-          "X${NODENAME}" == "XNode.js 14.x" ||
-          "X${NODENAME}" == "XNode.js 15.x" ||
-          "X${NODENAME}" == "XNode.js 17.x" ]]; then
-
-        print_bold \
-"                            DEPRECATION WARNING                            " "\
-${bold}${NODENAME} is no longer actively supported!${normal}
-
-  ${bold}You will not receive security or critical stability updates${normal} for this version.
-
-  You should migrate to a supported version of Node.js as soon as possible.
-  Use the installation script that corresponds to the version of Node.js you
-  wish to install. e.g.
-
-   * ${green}https://deb.nodesource.com/setup_16.x — Node.js 16 \"Gallium\"${normal}
-   * ${green}https://deb.nodesource.com/setup_18.x — Node.js 18 LTS \"Hydrogen\"${normal} (recommended)
-   * ${green}https://deb.nodesource.com/setup_19.x — Node.js 19 \"Nineteen\"${normal}
-   * ${green}https://deb.nodesource.com/setup_20.x — Node.js 20 \"Iron\"${normal} (current)
-
-  Please see ${bold}https://github.com/nodejs/Release${normal} for details about which
-  version may be appropriate for you.
-
-  The ${bold}NodeSource${normal} Node.js distributions repository contains
-  information both about supported versions of Node.js and supported Linux
-  distributions. To learn more about usage, see the repository:
-    ${bold}https://github.com/nodesource/distributions${normal}
-"
-        echo
-        echo "Continuing in 20 seconds ..."
-        echo
-        sleep 20
+check_os() {
+    if ! [ -f "/etc/debian_version" ]; then
+        echo "Error: This script is only supported on Debian-based systems."
+        exit 1
     fi
 }
 
-script_deprecation_warning() {
-    if [ "X${SCRSUFFIX}" == "X" ]; then
-        print_bold \
-"                         SCRIPT DEPRECATION WARNING                         " "\
-This script, located at ${bold}https://deb.nodesource.com/setup${normal}, used to
-  install Node.js 0.10, is deprecated and will eventually be made inactive.
+# Function to Install the script pre-requisites
+install_pre_reqs() {
+    log "Installing pre-requisites" "info"
 
-  You should use the script that corresponds to the version of Node.js you
-  wish to install. e.g.
+    # Run 'apt-get update'
+    if ! apt-get update -y; then
+        handle_error "$?" "Failed to run 'apt-get update'"
+    fi
 
-   * ${green}https://deb.nodesource.com/setup_16.x — Node.js 16 \"Gallium\"${normal}
-   * ${green}https://deb.nodesource.com/setup_18.x — Node.js 18 LTS \"Hydrogen\"${normal} (recommended)
-   * ${green}https://deb.nodesource.com/setup_19.x — Node.js 19 \"Nineteen\"${normal}
-   * ${green}https://deb.nodesource.com/setup_20.x — Node.js 20 \"Iron\"${normal} (current)
+    # Run 'apt-get install'
+    if ! apt-get install -y apt-transport-https ca-certificates curl gnupg; then
+        handle_error "$?" "Failed to install packages"
+    fi
 
-  Please see ${bold}https://github.com/nodejs/Release${normal} for details about which
-  version may be appropriate for you.
+    if ! mkdir -p /usr/share/keyrings; then
+      handle_error "$?" "Makes sure the path /usr/share/keyrings exist or run ' mkdir -p /usr/share/keyrings' with sudo"
+    fi
 
-  The ${bold}NodeSource${normal} Node.js Linux distributions GitHub repository contains
-  information about which versions of Node.js and which Linux distributions
-  are supported and how to use the install scripts.
-    ${bold}https://github.com/nodesource/distributions${normal}
-"
+    rm -f /usr/share/keyrings/nodesource.gpg || true
+    rm -f /etc/apt/sources.list.d/nodesource.list || true
 
-        echo
-        echo "Continuing in 20 seconds (press Ctrl-C to abort) ..."
-        echo
-        sleep 20
+    # Run 'curl' and 'gpg'
+    if ! curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg; then
+      handle_error "$?" "Failed to download and import the NodeSource signing key"
     fi
 }
 
-setup() {
+# Function to configure the Repo
+configure_repo() {
+    local node_version=$1
 
-script_deprecation_warning
-node_deprecation_warning
+    arch=$(dpkg --print-architecture)
+    if [ "$arch" != "amd64" ] && [ "$arch" != "arm64" ] && [ "$arch" != "armhf" ]; then
+      handle_error "1" "Unsupported architecture: $arch. Only amd64, arm64, and armhf are supported."
+    fi
 
-print_status "Installing the NodeSource ${NODENAME} repo..."
+    echo "deb [arch=$arch signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$node_version nodistro main" | tee /etc/apt/sources.list.d/nodesource.list > /dev/null
 
-if $(uname -m | grep -Eq ^armv6); then
-    print_status "You appear to be running on ARMv6 hardware. Unfortunately this is not currently supported by the NodeSource Linux distributions. Please use the 'linux-armv6l' binary tarballs available directly from nodejs.org for Node.js 4 and later."
-    exit 1
-fi
+    # N|solid Config
+    echo "Package: nsolid" | tee /etc/apt/preferences.d/nsolid > /dev/null
+    echo "Pin: origin deb.nodesource.com" | tee -a /etc/apt/preferences.d/nsolid > /dev/null
+    echo "Pin-Priority: 600" | tee -a /etc/apt/preferences.d/nsolid > /dev/null
 
-PRE_INSTALL_PKGS=""
+    # Nodejs Config
+    echo "Package: nodejs" | tee /etc/apt/preferences.d/nodejs > /dev/null
+    echo "Pin: origin deb.nodesource.com" | tee -a /etc/apt/preferences.d/nodejs > /dev/null
+    echo "Pin-Priority: 600" | tee -a /etc/apt/preferences.d/nodejs > /dev/null
 
-# Check that HTTPS transport is available to APT
-# (Check snaked from: https://get.docker.io/ubuntu/)
-
-if [ ! -e /usr/lib/apt/methods/https ]; then
-    PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} apt-transport-https"
-fi
-
-if [ ! -x /usr/bin/lsb_release ]; then
-    PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} lsb-release"
-fi
-
-if [ ! -x /usr/bin/curl ] && [ ! -x /usr/bin/wget ]; then
-    PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} curl"
-fi
-
-# Used by apt-key to add new keys
-
-if [ ! -x /usr/bin/gpg ]; then
-    PRE_INSTALL_PKGS="${PRE_INSTALL_PKGS} gnupg"
-fi
-
-# Populating Cache
-print_status "Populating apt-get cache..."
-exec_cmd 'apt-get update'
-
-if [ "X${PRE_INSTALL_PKGS}" != "X" ]; then
-    print_status "Installing packages required for setup:${PRE_INSTALL_PKGS}..."
-    # This next command needs to be redirected to /dev/null or the script will bork
-    # in some environments
-    exec_cmd "apt-get install -y${PRE_INSTALL_PKGS} > /dev/null 2>&1"
-fi
-
-IS_PRERELEASE=$(lsb_release -d | grep 'Ubuntu .*development' >& /dev/null; echo $?)
-if [[ $IS_PRERELEASE -eq 0 ]]; then
-    print_status "Your distribution, identified as \"$(lsb_release -d -s)\", is a pre-release version of Ubuntu. NodeSource does not maintain official support for Ubuntu versions until they are formally released. You can try using the manual installation instructions available at https://github.com/nodesource/distributions and use the latest supported Ubuntu version name as the distribution identifier, although this is not guaranteed to work."
-    exit 1
-fi
-
-DISTRO=$(lsb_release -c -s)
-
-check_alt() {
-    if [ "X${DISTRO}" == "X${2}" ]; then
-        echo
-        echo "## You seem to be using ${1} version ${DISTRO}."
-        echo "## This maps to ${3} \"${4}\"... Adjusting for you..."
-        DISTRO="${4}"
+    # Run 'apt-get update'
+    if ! apt-get update -y; then
+        handle_error "$?" "Failed to run 'apt-get update'"
+    else
+        log "Repository configured successfully."
+        log "To install Node.js, run: apt-get install nodejs -y" "info"
+        log "You can use N|solid Runtime as a node.js alternative" "info"
+        log "To install N|solid Runtime, run: apt-get install nsolid -y \n" "success"
     fi
 }
 
-check_alt "Astra Linux"    "orel"            "Debian"        "stretch"
-check_alt "BOSS"           "anokha"          "Debian"        "wheezy"
-check_alt "BOSS"           "anoop"           "Debian"        "jessie"
-check_alt "BOSS"           "drishti"         "Debian"        "stretch"
-check_alt "BOSS"           "unnati"          "Debian"        "buster"
-check_alt "BOSS"           "urja"            "Debian"        "bullseye"
-check_alt "bunsenlabs"     "bunsen-hydrogen" "Debian"        "jessie"
-check_alt "bunsenlabs"     "helium"          "Debian"        "stretch"
-check_alt "bunsenlabs"     "lithium"         "Debian"        "buster"
-check_alt "Devuan"         "jessie"          "Debian"        "jessie"
-check_alt "Devuan"         "ascii"           "Debian"        "stretch"
-check_alt "Devuan"         "beowulf"         "Debian"        "buster"
-check_alt "Devuan"         "chimaera"        "Debian"        "bullseye"
-check_alt "Devuan"         "ceres"           "Debian"        "sid"
-check_alt "Devuan"         "daedalus"        "Debian"        "bookworm"
-check_alt "Deepin"         "panda"           "Debian"        "sid"
-check_alt "Deepin"         "unstable"        "Debian"        "sid"
-check_alt "Deepin"         "stable"          "Debian"        "buster"
-check_alt "Deepin"         "apricot"         "Debian"        "buster"
-check_alt "Deepin"         "beige"           "Debian"        "bookworm"
-check_alt "elementaryOS"   "luna"            "Ubuntu"        "precise"
-check_alt "elementaryOS"   "freya"           "Ubuntu"        "trusty"
-check_alt "elementaryOS"   "loki"            "Ubuntu"        "xenial"
-check_alt "elementaryOS"   "juno"            "Ubuntu"        "bionic"
-check_alt "elementaryOS"   "hera"            "Ubuntu"        "bionic"
-check_alt "elementaryOS"   "odin"            "Ubuntu"        "focal"
-check_alt "elementaryOS"   "jolnir"          "Ubuntu"        "focal"
-check_alt "elementaryOS"   "horus"           "Ubuntu"        "jammy"
-check_alt "Kali"           "sana"            "Debian"        "jessie"
-check_alt "Kali"           "kali-rolling"    "Debian"        "bullseye"
-check_alt "Linux Mint"     "maya"            "Ubuntu"        "precise"
-check_alt "Linux Mint"     "qiana"           "Ubuntu"        "trusty"
-check_alt "Linux Mint"     "rafaela"         "Ubuntu"        "trusty"
-check_alt "Linux Mint"     "rebecca"         "Ubuntu"        "trusty"
-check_alt "Linux Mint"     "rosa"            "Ubuntu"        "trusty"
-check_alt "Linux Mint"     "sarah"           "Ubuntu"        "xenial"
-check_alt "Linux Mint"     "serena"          "Ubuntu"        "xenial"
-check_alt "Linux Mint"     "sonya"           "Ubuntu"        "xenial"
-check_alt "Linux Mint"     "sylvia"          "Ubuntu"        "xenial"
-check_alt "Linux Mint"     "tara"            "Ubuntu"        "bionic"
-check_alt "Linux Mint"     "tessa"           "Ubuntu"        "bionic"
-check_alt "Linux Mint"     "tina"            "Ubuntu"        "bionic"
-check_alt "Linux Mint"     "tricia"          "Ubuntu"        "bionic"
-check_alt "Linux Mint"     "ulyana"          "Ubuntu"        "focal"
-check_alt "Linux Mint"     "ulyssa"          "Ubuntu"        "focal"
-check_alt "Linux Mint"     "uma"             "Ubuntu"        "focal"
-check_alt "Linux Mint"     "una"             "Ubuntu"        "focal"
-check_alt "Linux Mint"     "vanessa"         "Ubuntu"        "jammy"
-check_alt "Linux Mint"     "vera"            "Ubuntu"        "jammy"
-check_alt "Liquid Lemur"   "lemur-3"         "Debian"        "stretch"
-check_alt "LMDE"           "betsy"           "Debian"        "jessie"
-check_alt "LMDE"           "cindy"           "Debian"        "stretch"
-check_alt "LMDE"           "debbie"          "Debian"        "buster"
-check_alt "LMDE"           "elsie"           "Debian"        "bullseye"
-check_alt "MX Linux 17"    "Horizon"         "Debian"        "stretch"
-check_alt "MX Linux 18"    "Continuum"       "Debian"        "stretch"
-check_alt "MX Linux 19"    "patito feo"      "Debian"        "buster"
-check_alt "MX Linux 21"    "wildflower"      "Debian"        "bullseye"
-check_alt "Pardus"         "onyedi"          "Debian"        "stretch"
-check_alt "Parrot"         "ara"             "Debian"        "bullseye"
-check_alt "PureOS"         "green"           "Debian"        "sid"
-check_alt "PureOS"         "amber"           "Debian"        "buster"
-check_alt "PureOS"         "byzantium"       "Debian"        "bullseye"
-check_alt "SolydXK"        "solydxk-9"       "Debian"        "stretch"
-check_alt "Sparky Linux"   "Tyche"           "Debian"        "stretch"
-check_alt "Sparky Linux"   "Nibiru"          "Debian"        "buster"
-check_alt "Sparky Linux"   "Po-Tolo"         "Debian"        "bullseye"
-check_alt "Tanglu"         "chromodoris"     "Debian"        "jessie"
-check_alt "Trisquel"       "toutatis"        "Ubuntu"        "precise"
-check_alt "Trisquel"       "belenos"         "Ubuntu"        "trusty"
-check_alt "Trisquel"       "flidas"          "Ubuntu"        "xenial"
-check_alt "Trisquel"       "etiona"          "Ubuntu"        "bionic"
-check_alt "Ubilinux"       "dolcetto"        "Debian"        "stretch"
-check_alt "Uruk GNU/Linux" "lugalbanda"      "Ubuntu"        "xenial"
+# Define Node.js version
+NODE_VERSION="18.x"
 
-if [ "X${DISTRO}" == "Xdebian" ]; then
-  print_status "Unknown Debian-based distribution, checking /etc/debian_version..."
-  NEWDISTRO=$([ -e /etc/debian_version ] && cut -d/ -f1 < /etc/debian_version)
-  if [ "X${NEWDISTRO}" == "X" ]; then
-    print_status "Could not determine distribution from /etc/debian_version..."
-  else
-    DISTRO=$NEWDISTRO
-    print_status "Found \"${DISTRO}\" in /etc/debian_version..."
-  fi
-fi
+# Check OS
+check_os
 
-print_status "Confirming \"${DISTRO}\" is supported..."
-
-if [ -x /usr/bin/curl ]; then
-    exec_cmd_nobail "curl -sLf -o /dev/null 'https://deb.nodesource.com/${NODEREPO}/dists/${DISTRO}/Release'"
-    RC=$?
-else
-    exec_cmd_nobail "wget -qO /dev/null -o /dev/null 'https://deb.nodesource.com/${NODEREPO}/dists/${DISTRO}/Release'"
-    RC=$?
-fi
-
-if [[ $RC != 0 ]]; then
-    print_status "Your distribution, identified as \"${DISTRO}\", is not currently supported, please contact NodeSource at https://github.com/nodesource/distributions/issues if you think this is incorrect or would like your distribution to be considered for support"
-    exit 1
-fi
-
-if [ -f "/etc/apt/sources.list.d/chris-lea-node_js-$DISTRO.list" ]; then
-    print_status 'Removing Launchpad PPA Repository for NodeJS...'
-
-    exec_cmd_nobail 'add-apt-repository -y -r ppa:chris-lea/node.js'
-    exec_cmd "rm -f /etc/apt/sources.list.d/chris-lea-node_js-${DISTRO}.list"
-fi
-
-print_status 'Adding the NodeSource signing key to your keyring...'
-keyring='/usr/share/keyrings'
-node_key_url="https://deb.nodesource.com/gpgkey/nodesource.gpg.key"
-local_node_key="$keyring/nodesource.gpg"
-
-if [ -x /usr/bin/curl ]; then
-    exec_cmd "curl -s $node_key_url | gpg --dearmor | tee $local_node_key >/dev/null"
-else
-    exec_cmd "wget -q -O - $node_key_url | gpg --dearmor | tee $local_node_key >/dev/null"
-fi
-
-print_status "Creating apt sources list file for the NodeSource ${NODENAME} repo..."
-
-exec_cmd "echo 'deb [signed-by=$local_node_key] https://deb.nodesource.com/${NODEREPO} ${DISTRO} main' > /etc/apt/sources.list.d/nodesource.list"
-exec_cmd "echo 'deb-src [signed-by=$local_node_key] https://deb.nodesource.com/${NODEREPO} ${DISTRO} main' >> /etc/apt/sources.list.d/nodesource.list"
-
-print_status 'Running `apt-get update` for you...'
-
-exec_cmd 'apt-get update'
-
-yarn_site='https://dl.yarnpkg.com/debian'
-yarn_key_url="$yarn_site/pubkey.gpg"
-local_yarn_key="$keyring/yarnkey.gpg"
-
-print_status """Run \`${bold}sudo apt-get install -y ${NODEPKG}${normal}\` to install ${NODENAME} and npm
-## You may also need development tools to build native addons:
-     sudo apt-get install gcc g++ make
-## To install the Yarn package manager, run:
-     curl -sL $yarn_key_url | gpg --dearmor | sudo tee $local_yarn_key >/dev/null
-     echo \"deb [signed-by=$local_yarn_key] $yarn_site stable main\" | sudo tee /etc/apt/sources.list.d/yarn.list
-     sudo apt-get update && sudo apt-get install yarn
-"""
-
-}
-
-## Defer setup until we have the complete script
-setup
+# Main execution
+install_pre_reqs || handle_error $? "Failed installing pre-requisites"
+configure_repo "$NODE_VERSION" || handle_error $? "Failed configuring repository"

package.json

@@ -13,11 +13,12 @@
     "deploy": "dotenv -c -- turbo run deploy --concurrency=1",
     "dev": "dotenv -c -- turbo run dev",
     "docs": "dotenv -c -- turbo run docs && typedoc && mkdir docs/api && cp packages/core/lib/api-doc.html docs/api/index.html && cp packages/core/lib/openapi.json docs/api/openapi.json && cp -r packages/core/lib/schema docs/api/schema",
+    "docs:serve": "http-server docs -p 8080 -o",
     "format": "dotenv -c -- turbo run format",
     "format:fix": "dotenv -c -- turbo run format:fix",
     "lint": "dotenv -c -- turbo run lint",
     "lint:fix": "dotenv -c -- turbo run lint:fix",
-    "publish-packages": "pnpm changeset version && pnpm syncpack:fix && pnpm install && git add . && git commit -m \"docs: update changelogs for release\n\nci: publish release\" && git push && pnpm changeset tag && git push --follow-tags",
+    "publish-packages": "pnpm changeset version && pnpm syncpack:fix && pnpm install && pnpm format:fix && git add . && git commit -m \"docs: update changelogs for release\" -m \"ci: publish release\" && git push && pnpm changeset tag && git push --follow-tags",
     "syncpack": "syncpack list-mismatches && syncpack lint-semver-ranges --types dev,peer,prod",
     "syncpack:fix": "syncpack format && syncpack fix-mismatches",
     "test": "trap 'node coverage.mjs' EXIT && dotenv -c -- turbo run test",
@@ -34,6 +35,7 @@
     "deepmerge": "4.3.1",
     "dotenv-cli": "7.2.1",
     "glob": "10.3.10",
+    "http-server": "14.1.1",
     "junit-report-merger": "6.0.3",
     "prettier": "3.1.1",
     "syncpack": "12.3.0",

packages/api-cli/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @openstapps/api-cli
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/core-tools@3.3.2
+- @openstapps/api@3.3.2
+
 ## 3.3.0
 
 ### Minor Changes

packages/api-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/api-cli",
   "description": "CLI client for @openstapps/api",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/api.git",

packages/api-plugin/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @openstapps/api-plugin
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+- @openstapps/core-tools@3.3.2
+- @openstapps/api@3.3.2
+
 ## 3.3.0
 
 ### Patch Changes

packages/api-plugin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/api-plugin",
   "description": "Node.js library to interact with the StApps backend service",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/api.git",

packages/api/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @openstapps/api
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core@3.3.2
+
 ## 3.3.0
 
 ### Minor Changes

packages/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/api",
   "description": "Node.js library to interact with the StApps backend service",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/api.git",

packages/core-tools/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @openstapps/core-tools
 
+## 3.3.2
+
+### Patch Changes
+
+- Updated dependencies [802a7a3f]
+  - @openstapps/easy-ast@3.3.2
+
 ## 3.3.0
 
 ### Patch Changes

packages/core-tools/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/core-tools",
   "description": "Tools to convert and validate StAppsCore",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/core-tools.git",

packages/core/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @openstapps/core
 
+## 3.3.2
+
+### Patch Changes
+
+- @openstapps/core-tools@3.3.2
+
 ## 3.3.0
 
 ### Minor Changes

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/core",
   "description": "StAppsCore - Generalized model of data",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/core.git",

packages/easy-ast/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @openstapps/easy-ast
 
+## 3.3.2
+
+### Patch Changes
+
+- 802a7a3f: Fixed docs generation
+
 ## 3.3.0
 
 ### Minor Changes

packages/easy-ast/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openstapps/easy-ast",
   "description": "Tool to easily handle TypeScript AST",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "type": "module",
   "license": "GPL-3.0-only",
   "repository": "git@gitlab.com:openstapps/core-tools.git",

packages/easy-ast/test/project/alias-like.ast-test.ts

@@ -17,10 +17,8 @@ import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 import {TypeFlags} from 'typescript';
 
-// @ts-expect-error unused type
 type TestTypeAlias = number | string;
 
-// @ts-expect-error unused type
 enum TestEnum {
   Foo,
   Bar,

packages/easy-ast/test/project/array-like.ast-test.ts

@@ -18,13 +18,9 @@ import {LightweightDefinitionKind} from '../../src/index.js';
 
 interface Random {}
 
-// @ts-expect-error unused type
 type TestArrayGeneric = Array<string>;
-// @ts-expect-error unused type
 type TestArrayLiteral = number[];
-// @ts-expect-error unused type
 type TestArrayReferenceGeneric = Array<Random>;
-// @ts-expect-error unused type
 type TestArrayReferenceLiteral = Random[];
 
 export const testConfig: EasyAstSpecType = {

packages/easy-ast/test/project/class-like.ast-test.ts

@@ -16,12 +16,10 @@
 import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 
-// @ts-expect-error unused type
 interface TestInterface {
   foo: number;
 }
 
-// @ts-expect-error unused type
 class TestClass {
   bar: string = 'test';
 }

packages/easy-ast/test/project/comment.ast-test.ts

@@ -22,10 +22,8 @@ import {LightweightDefinitionKind} from '../../src/index.js';
  * Class description
  *
  * More description
- *
  * @classTag classParameter1 classParameter2
  */
-// @ts-expect-error unused type
 interface TestInterface {
   /**
    * Property comment
@@ -33,7 +31,6 @@ interface TestInterface {
    * Property description
    *
    * More description
-   *
    * @propertyTag propertyParameter1 propertyParameter2
    */
   foo: string;
@@ -45,10 +42,8 @@ interface TestInterface {
  * Class description
  *
  * More description
- *
  * @classTag classParameter1 classParameter2
  */
-// @ts-expect-error unused type
 class TestClass {
   /**
    * Property comment
@@ -56,7 +51,6 @@ class TestClass {
    * Property description
    *
    * More description
-   *
    * @propertyTag propertyParameter1 propertyParameter2
    */
   foo = 1;
@@ -68,10 +62,8 @@ class TestClass {
  * Enum description
  *
  * More description
- *
  * @enumTag enumParameter1
  */
-// @ts-expect-error unused type
 enum TestAlias {}
 
 export const testConfig: EasyAstSpecType = {

packages/easy-ast/test/project/default-generics.ast-test.ts

@@ -20,7 +20,6 @@ interface Test1<T = number> {
   foo: T;
 }
 
-// @ts-expect-error unused type
 interface Test2 {
   bar: Test1;
 }

packages/easy-ast/test/project/enum-specified-value.ast-test.ts

@@ -17,13 +17,11 @@ import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 import {TypeFlags} from 'typescript';
 
-// @ts-expect-error unused type
 enum TestAuto {
   Foo,
   Bar,
 }
 
-// @ts-expect-error unused type
 enum TestSpecified {
   YES = 'yes',
   NO = 'no',

packages/easy-ast/test/project/generics.ast-test.ts

@@ -18,7 +18,6 @@ import {LightweightDefinitionKind} from '../../src/index.js';
 
 interface $Random {}
 
-// @ts-expect-error unused type
 interface Generics {
   baz: Foo<number, $Random>;
 }

packages/easy-ast/test/project/index-signature.ast-test.ts

@@ -18,12 +18,10 @@ import {LightweightDefinitionKind} from '../../src/index.js';
 
 interface $Random {}
 
-// @ts-expect-error unused
 interface IndexSignatureObject {
   [key: string]: $Random;
 }
 
-// @ts-expect-error unused
 interface IndexSignaturePrimitive {
   [key: string]: number;
 }

packages/easy-ast/test/project/ineritance.ast-test.ts

@@ -26,7 +26,6 @@ interface $BaseInterface2 {
 
 class $BaseClass {}
 
-// @ts-expect-error unused
 class InheritingClass extends $BaseClass implements $BaseInterface<number>, $BaseInterface2 {
   bar: string = '';
 

packages/easy-ast/test/project/nested.ast-test.ts

@@ -16,7 +16,6 @@
 import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 
-// @ts-expect-error unused
 interface NestedObject {
   nested: {
     deeplyNested: {

packages/easy-ast/test/project/primitive-types.ast-test.ts

@@ -17,7 +17,6 @@ import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 import {TypeFlags} from 'typescript';
 
-// @ts-expect-error unused
 interface Test {
   number_type: number;
   string_type: string;

packages/easy-ast/test/project/stack-overflow.ast-test.ts

@@ -16,7 +16,6 @@
 import {EasyAstSpecType} from '../easy-ast-spec-type.js';
 import {LightweightDefinitionKind} from '../../src/index.js';
 
-// @ts-expect-error unused
 interface Foo<T extends Bar<string>> {
   bar: T;
 }

packages/es-mapping-generator/src/config/premap.ts

@@ -27,15 +27,7 @@ export const premaps: Record<string, MappingProperty> = {
     type: 'geo_shape',
   },
   'Point': {
-    properties: {
-      type: {
-        type: 'keyword',
-      },
-      coordinates: {
-        type: 'geo_point',
-      },
-    },
-    dynamic: 'strict',
+    type: 'geo_point',
   },
   'Polygon': {
     type: 'geo_shape',

pnpm-lock.yaml

@@ -26,6 +26,9 @@ importers:
       glob:
         specifier: 10.3.10
         version: 10.3.10
+      http-server:
+        specifier: 14.1.1
+        version: 14.1.1
       junit-report-merger:
         specifier: 6.0.3
         version: 6.0.3
@@ -4659,22 +4662,23 @@ packages:
     resolution: {integrity: sha512-0QZDBePnb5a+d76zjlMYq96IDf0AOuGP7JHugFUYlYwTC7rZvROuZSpoUsvpUjNH2CzMqWgNLIekIR6EHRMIQA==}
     engines: {node: '>=14'}
     dependencies:
-      '@elastic/transport': 8.3.2
+      '@elastic/transport': 8.7.0
       tslib: 2.4.1
     transitivePeerDependencies:
       - supports-color
     dev: false
 
-  /@elastic/transport@8.3.2:
-    resolution: {integrity: sha512-ZiBYRVPj6pwYW99fueyNU4notDf7ZPs7Ix+4T1btIJsKJmeaORIItIfs+0O7KV4vV+DcvyMhkY1FXQx7kQOODw==}
-    engines: {node: '>=14'}
+  /@elastic/transport@8.7.0:
+    resolution: {integrity: sha512-IqXT7a8DZPJtqP2qmX1I2QKmxYyN27kvSW4g6pInESE1SuGwZDp2FxHJ6W2kwmYOJwQdAt+2aWwzXO5jHo9l4A==}
+    engines: {node: '>=18'}
     dependencies:
+      '@opentelemetry/api': 1.9.0
       debug: 4.3.4(supports-color@8.1.1)
       hpagent: 1.2.0
       ms: 2.1.3
       secure-json-parse: 2.7.0
       tslib: 2.6.2
-      undici: 5.22.1
+      undici: 6.19.2
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -6296,6 +6300,11 @@ packages:
       - debug
     dev: false
 
+  /@opentelemetry/api@1.9.0:
+    resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
+    engines: {node: '>=8.0.0'}
+    dev: false
+
   /@pkgjs/parseargs@0.11.0:
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
@@ -8564,6 +8573,7 @@ packages:
     engines: {node: '>=10.16.0'}
     dependencies:
       streamsearch: 1.1.0
+    dev: true
 
   /bytes@3.0.0:
     resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==}
@@ -11744,6 +11754,7 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
+    dev: false
 
   /follow-redirects@1.15.6:
     resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
@@ -12648,7 +12659,7 @@ packages:
     engines: {node: '>=8.0.0'}
     dependencies:
       eventemitter3: 4.0.7
-      follow-redirects: 1.15.3
+      follow-redirects: 1.15.6
       requires-port: 1.0.0
     transitivePeerDependencies:
       - debug
@@ -18214,6 +18225,7 @@ packages:
   /streamsearch@1.1.0:
     resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
     engines: {node: '>=10.0.0'}
+    dev: true
 
   /streamx@2.15.1:
     resolution: {integrity: sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA==}
@@ -19481,6 +19493,12 @@ packages:
     engines: {node: '>=14.0'}
     dependencies:
       busboy: 1.6.0
+    dev: true
+
+  /undici@6.19.2:
+    resolution: {integrity: sha512-JfjKqIauur3Q6biAtHJ564e3bWa8VvT+7cSiOJHFbX4Erv6CLGDpg8z+Fmg/1OI/47RA+GI2QZaF48SSaLvyBA==}
+    engines: {node: '>=18.17'}
+    dev: false
 
   /undici@6.7.1:
     resolution: {integrity: sha512-+Wtb9bAQw6HYWzCnxrPTMVEV3Q1QjYanI0E4q02ehReMuquQdLTEFEYbfs7hcImVYKcQkWSwT6buEmSVIiDDtQ==}