Merge branch 'main' into v1.6439.0

Author: jremy42

eslint.config.mjs

@@ -20,6 +20,7 @@ export default [
       'packages/client/src/vendor/base64/index.js',
       'packages/configuration-loader/.eslintrc.cjs',
       'scripts/generatePackages.ts',
+      'scripts/*.ts',
     ],
   },
   {

lerna.json

@@ -1,5 +1,5 @@
 {
-  "packages": ["packages/*"],
+  "packages": ["packages/*", "packages_generated/*"],
   "npmClient": "pnpm",
   "version": "independent",
   "command": {

package.json

@@ -11,9 +11,10 @@
   },
   "type": "module",
   "scripts": {
-    "generateIndex": "pnpm dlx tsx ./scripts/generatePackages.ts",
+    "generateAlias": "pnpm dlx tsx ./scripts/generateAlias.ts",
+    "generatePackages": "pnpm dlx tsx ./scripts/generatePackages.ts",
     "generateGlobalSdkPackage": "pnpm dlx tsx ./scripts/updateGlobalSdkPackage.ts",
-    "prebuild": "pnpm run generateIndex && pnpm run generateGlobalSdkPackage &&  pnpm format",
+    "prebuild": "pnpm run generatePackages && pnpm run generateAlias &&  pnpm format",
     "build": "pnpm turbo build",
     "typecheck": "pnpm turbo typecheck",
     "build:profile": "cross-env PROFILE=true pnpm run build",

packages/client/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.1](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2025-04-24)
+
+### Bug Fixes
+
+- sdk client deps ([#2056](https://github.com/scaleway/scaleway-sdk-js/issues/2056)) ([82ee89e](https://github.com/scaleway/scaleway-sdk-js/commit/82ee89e9745fc52875d81fbd0a6e277e1b0f4fa8))
+
+## 1.2.0 (2025-04-24)
+
+### Features
+
+- **client:** add pl-waw-3 zone, add headers, add sessionheader ([#2016](https://github.com/scaleway/scaleway-sdk-js/issues/2016)) ([332b58f](https://github.com/scaleway/scaleway-sdk-js/commit/332b58ff08798c661b323d32ac425c8e3ae0f203))
+- **marshalling:** add any marshalling ([#2054](https://github.com/scaleway/scaleway-sdk-js/issues/2054)) ([5cbcf99](https://github.com/scaleway/scaleway-sdk-js/commit/5cbcf99834dcb6293825ae96fc34cd2c4e012183))
+
 ## [1.1.1](https://github.com/scaleway/scaleway-sdk-js/compare/@scaleway/[email protected]...@scaleway/[email protected]) (2025-03-31)
 
 **Note:** Version bump only for package @scaleway/sdk-client

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaleway/sdk-client",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "license": "Apache-2.0",
   "description": "Scaleway SDK Client",
   "keywords": [

packages/client/src/helpers/json.ts

@@ -42,3 +42,68 @@ export const isJSONObject = (obj: unknown): obj is JSONObject => {
     objT === 'object'
   )
 }
+
+/**
+ * Camelizes a string.
+ *
+ * @param str - The string to camelize
+ * @returns The camelized string
+ *
+ * @internal
+ */
+export const camelize = (str: string): string => {
+  const strLength = str.length
+  if (strLength <= 0) {
+    return str
+  }
+  let out = ''
+  for (let capNext = false, index = 0; index < strLength; index += 1) {
+    const char = str.charAt(index)
+    if (char >= 'a' && char <= 'z') {
+      if (capNext) {
+        out += char.toUpperCase()
+      } else {
+        out += char
+      }
+    } else if (char >= 'A' && char <= 'Z') {
+      out += char
+    } else if (char >= '0' && char <= '9') {
+      out += char
+    }
+    capNext = char === '_' || char === ' ' || char === '-' || char === '.'
+  }
+
+  return out.charAt(0).toLowerCase() + out.substring(1)
+}
+
+/**
+ * Camelizes keys of an object (deeply).
+ *
+ * @param obj - The object
+ * @param ignoreKeys - The keys to ignore
+ * @returns The object with camelized keys
+ *
+ * @internal
+ */
+export const camelizeKeys = <T>(
+  obj: object | unknown[] | unknown,
+  ignoreKeys: string[] = [],
+): T => {
+  if (Array.isArray(obj)) {
+    return obj.map(v => camelizeKeys(v, ignoreKeys)) as unknown as T
+  }
+
+  if (obj && typeof obj === 'object' && !(obj instanceof Date)) {
+    return Object.entries(obj).reduce(
+      (acc, [key, value]) => ({
+        ...acc,
+        [camelize(key)]: ignoreKeys.includes(key)
+          ? (value as unknown)
+          : camelizeKeys(value, ignoreKeys),
+      }),
+      {},
+    ) as T
+  }
+
+  return obj as T
+}

packages/client/src/index.ts

@@ -26,7 +26,6 @@ export {
 export type { ClientConfig } from './scw/client-ini-factory'
 export { Decimal } from './scw/custom-types'
 export type { Money, ScwFile, TimeSeries } from './scw/custom-types'
-
 export * as Errors from './scw/errors/standard'
 export type { Region, Zone } from './scw/locality'
 export * from './internals'

packages/client/src/internals.ts

@@ -11,11 +11,12 @@ export { authenticateWithSessionToken } from './scw/auth'
 
 export type { DefaultValues } from './scw/client-settings'
 export {
+  marshalBlobToScwFile,
   marshalDecimal,
-  marshalScwFile,
   marshalMoney,
+  marshalScwFile,
   marshalTimeSeries,
-  marshalBlobToScwFile,
+  unmarshalAnyRes,
   unmarshalDecimal,
   unmarshalMoney,
   unmarshalScwFile,

packages/client/src/scw/custom-marshalling.ts

@@ -1,4 +1,4 @@
-import { isJSONObject } from '../helpers/json'
+import { camelizeKeys, isJSONObject } from '../helpers/json'
 import { unmarshalArrayOfObject, unmarshalDate } from '../helpers/marshalling'
 import { fromByteArray } from '../vendor/base64'
 import type {
@@ -207,3 +207,61 @@ export const marshalTimeSeries = (
 export const marshalDecimal = (obj: Decimal): { value: string } => ({
   value: obj.toString(),
 })
+
+/**
+ * Unmarshals record to convert iso dates from string to Dates.
+ *
+ * @param obj - The input
+ * @param keys - The keys requiring a conversion
+ * @returns The updated input
+ *
+ * @internal
+ */
+export const unmarshalDates = <T>(obj: unknown, keys: string[]): T => {
+  if (Array.isArray(obj)) {
+    return obj.map(v => unmarshalDates(v, keys)) as unknown as T
+  }
+
+  if (obj && typeof obj === 'object') {
+    return Object.entries(obj).reduce(
+      (acc, [key, value]) => ({
+        ...acc,
+        [key]:
+          typeof value === 'string' && keys.includes(key)
+            ? new Date(value)
+            : unmarshalDates(value, keys),
+      }),
+      {},
+    ) as T
+  }
+
+  return obj as T
+}
+
+/**
+ * Unmarshals input to a record with camilized keys and instanciated Date.
+ *
+ * @param obj - The input
+ * @param ignoreKeys - The keys which should be not be transformed
+ * @param dateKeys - The keys which should be transformed to Date
+ * @returns The record
+ *
+ * @throws TypeError
+ * Thrown if the input isn't {@link JSONObject}.
+ *
+ * @internal
+ */
+export const unmarshalAnyRes = <T>(
+  obj: unknown,
+  ignoreKeys: string[] = [],
+  dateKeys?: string[],
+): T => {
+  if (!isJSONObject(obj)) {
+    throw new TypeError(`Data isn't a dictionary.`)
+  }
+
+  return camelizeKeys(
+    dateKeys && dateKeys.length > 0 ? unmarshalDates(obj, dateKeys) : obj,
+    ignoreKeys,
+  )
+}