apimo.js 1.0.5 → 1.1.0

package/dist/core/api.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import Bottleneck from 'bottleneck';
 import { merge } from 'merge-anything';
 import { z } from 'zod';
@@ -79,113 +70,99 @@ export class Apimo {
         const extendedInit = Object.assign(Object.assign({}, init), { headers: Object.assign({ Authorization: `Basic ${btoa(`${this.provider}:${this.token}`)}` }, init === null || init === void 0 ? void 0 : init.headers) });
         return this.limiter.schedule(() => fetch(input, extendedInit));
     }
-    get(path, schema, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const url = makeApiUrl(path, this.config, Object.assign({ culture: this.config.culture }, options));
-            const { attempts, initialDelayMs, backoff } = this.config.retry;
-            let lastError;
-            for (let attempt = 1; attempt <= attempts; attempt++) {
-                try {
-                    const response = yield this.fetch(url);
-                    if (!response.ok) {
-                        let responseBody;
-                        try {
-                            responseBody = yield response.json();
-                        }
-                        catch (_a) {
-                            // The body wasn't JSON — leave responseBody as undefined
-                        }
-                        throwForStatus(response.status, url.toString(), responseBody);
+    async get(path, schema, options) {
+        const url = makeApiUrl(path, this.config, Object.assign({ culture: this.config.culture }, options));
+        const { attempts, initialDelayMs, backoff } = this.config.retry;
+        let lastError;
+        for (let attempt = 1; attempt <= attempts; attempt++) {
+            try {
+                const response = await this.fetch(url);
+                if (!response.ok) {
+                    let responseBody;
+                    try {
+                        responseBody = await response.json();
                     }
-                    const json = yield response.json();
-                    const result = yield schema.safeParseAsync(json);
-                    if (!result.success) {
-                        throw new ApiResponseValidationError(url.toString(), result.error);
+                    catch (_a) {
+                        // The body wasn't JSON — leave responseBody as undefined
                     }
-                    return result.data;
+                    throwForStatus(response.status, url.toString(), responseBody);
                 }
-                catch (error) {
-                    lastError = error;
-                    const hasMoreAttempts = attempt < attempts;
-                    if (!isRetryable(error)) {
-                        // Non-transient errors (4xx, schema failures, etc.) — propagate immediately
-                        throw error;
-                    }
-                    if (!hasMoreAttempts) {
-                        break;
-                    }
-                    yield this.sleep(this.retryDelayMs(attempt, initialDelayMs, backoff));
+                const json = await response.json();
+                const result = await schema.safeParseAsync(json);
+                if (!result.success) {
+                    throw new ApiResponseValidationError(url.toString(), result.error);
                 }
+                return result.data;
             }
-            throw new ApiRetryExhaustedError(attempts, lastError);
-        });
+            catch (error) {
+                lastError = error;
+                const hasMoreAttempts = attempt < attempts;
+                if (!isRetryable(error)) {
+                    // Non-transient errors (4xx, schema failures, etc.) — propagate immediately
+                    throw error;
+                }
+                if (!hasMoreAttempts) {
+                    break;
+                }
+                await this.sleep(this.retryDelayMs(attempt, initialDelayMs, backoff));
+            }
+        }
+        throw new ApiRetryExhaustedError(attempts, lastError);
     }
-    fetchCatalogs() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.get(['catalogs'], z.array(CatalogDefinitionSchema));
-        });
+    async fetchCatalogs() {
+        return this.get(['catalogs'], z.array(CatalogDefinitionSchema));
     }
-    populateCache(catalogName, culture, id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const catalog = yield this.fetchCatalog(catalogName, { culture });
-            yield this.cache.setEntries(catalogName, culture, catalog);
-            if (id !== undefined) {
-                const queriedKey = catalog.find(({ id: entryId }) => entryId === id);
-                return queriedKey
-                    ? {
-                        name: queriedKey.name,
-                        namePlural: queriedKey.name_plurial,
-                    }
-                    : null;
-            }
-        });
+    async populateCache(catalogName, culture, id) {
+        const catalog = await this.fetchCatalog(catalogName, { culture });
+        await this.cache.setEntries(catalogName, culture, catalog);
+        if (id !== undefined) {
+            const queriedKey = catalog.find(({ id: entryId }) => entryId === id);
+            return queriedKey
+                ? {
+                    name: queriedKey.name,
+                    namePlural: queriedKey.name_plurial,
+                }
+                : null;
+        }
     }
-    getCatalogEntries(catalogName, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            try {
-                return yield this.cache.getEntries(catalogName, (_a = options === null || options === void 0 ? void 0 : options.culture) !== null && _a !== void 0 ? _a : this.config.culture);
+    async getCatalogEntries(catalogName, options) {
+        var _a, _b, _c;
+        try {
+            return await this.cache.getEntries(catalogName, (_a = options === null || options === void 0 ? void 0 : options.culture) !== null && _a !== void 0 ? _a : this.config.culture);
+        }
+        catch (e) {
+            if (e instanceof CacheExpiredError) {
+                await this.populateCache(catalogName, (_b = options === null || options === void 0 ? void 0 : options.culture) !== null && _b !== void 0 ? _b : this.config.culture);
+                return this.cache.getEntries(catalogName, (_c = options === null || options === void 0 ? void 0 : options.culture) !== null && _c !== void 0 ? _c : this.config.culture);
             }
-            catch (e) {
-                if (e instanceof CacheExpiredError) {
-                    yield this.populateCache(catalogName, (_b = options === null || options === void 0 ? void 0 : options.culture) !== null && _b !== void 0 ? _b : this.config.culture);
-                    return this.cache.getEntries(catalogName, (_c = options === null || options === void 0 ? void 0 : options.culture) !== null && _c !== void 0 ? _c : this.config.culture);
-                }
-                else {
-                    throw e;
-                }
+            else {
+                throw e;
             }
-        });
+        }
     }
-    fetchCatalog(catalogName, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.get(['catalogs', catalogName], z.array(CatalogEntrySchema), options);
-        });
+    async fetchCatalog(catalogName, options) {
+        return this.get(['catalogs', catalogName], z.array(CatalogEntrySchema), options);
     }
-    fetchAgencies(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            return this.get(['agencies'], z.object({
-                total_items: z.number(),
-                agencies: getAgencySchema(this.getLocalizedCatalogTransformer((_a = options === null || options === void 0 ? void 0 : options.culture) !== null && _a !== void 0 ? _a : this.config.culture), this.config).array(),
-                timestamp: z.number(),
-            }));
-        });
+    async fetchAgencies(options) {
+        var _a;
+        return this.get(['agencies'], z.object({
+            total_items: z.number(),
+            agencies: getAgencySchema(this.getLocalizedCatalogTransformer((_a = options === null || options === void 0 ? void 0 : options.culture) !== null && _a !== void 0 ? _a : this.config.culture), this.config).array(),
+            timestamp: z.number(),
+        }));
     }
-    fetchProperties(agencyId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            return this.get(['agencies', agencyId.toString(), 'properties'], z.object({
-                total_items: z.number(),
-                timestamp: z.number(),
-                properties: getPropertySchema(this.getLocalizedCatalogTransformer((_a = options === null || options === void 0 ? void 0 : options.culture) !== null && _a !== void 0 ? _a : this.config.culture)).array(),
-            }), options);
-        });
+    async fetchProperties(agencyId, options) {
+        var _a;
+        return this.get(['agencies', agencyId.toString(), 'properties'], z.object({
+            total_items: z.number(),
+            timestamp: z.number(),
+            properties: getPropertySchema(this.getLocalizedCatalogTransformer((_a = options === null || options === void 0 ? void 0 : options.culture) !== null && _a !== void 0 ? _a : this.config.culture)).array(),
+        }), options);
     }
     /** Calculates the delay before the next retry attempt (1-based attempt index). */
     retryDelayMs(attempt, initialDelayMs, backoff) {
         switch (backoff) {
-            case 'exponential': return initialDelayMs * Math.pow(2, (attempt - 1));
+            case 'exponential': return initialDelayMs * 2 ** (attempt - 1);
             case 'linear': return initialDelayMs * attempt;
             case 'fixed': return initialDelayMs;
         }
@@ -194,7 +171,7 @@ export class Apimo {
         return new Promise(resolve => setTimeout(resolve, ms));
     }
     getLocalizedCatalogTransformer(culture) {
-        return (catalogName, id) => __awaiter(this, void 0, void 0, function* () {
+        return async (catalogName, id) => {
             if (!this.config.catalogs.transform.active) {
                 return `${catalogName}.${id}`;
             }
@@ -202,21 +179,19 @@ export class Apimo {
                 return this.config.catalogs.transform.transformFn(catalogName, culture, id);
             }
             return this.catalogTransformer(catalogName, culture, id);
-        });
+        };
     }
-    catalogTransformer(catalogName, culture, id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return yield this.cache.getEntry(catalogName, culture, id);
+    async catalogTransformer(catalogName, culture, id) {
+        try {
+            return await this.cache.getEntry(catalogName, culture, id);
+        }
+        catch (e) {
+            if (e instanceof CacheExpiredError) {
+                return await this.populateCache(catalogName, culture, id);
             }
-            catch (e) {
-                if (e instanceof CacheExpiredError) {
-                    return yield this.populateCache(catalogName, culture, id);
-                }
-                else {
-                    throw e;
-                }
+            else {
+                throw e;
             }
-        });
+        }
     }
 }

package/dist/services/storage/dummy.cache.js

@@ -1,28 +1,13 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { CacheExpiredError } from './types';
 export class DummyCache {
     constructor() {
     }
-    getEntries(_catalogName, _culture) {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new CacheExpiredError();
-        });
+    async getEntries(_catalogName, _culture) {
+        throw new CacheExpiredError();
     }
-    setEntries(_catalogName, _culture, _entries) {
-        return __awaiter(this, void 0, void 0, function* () {
-        });
+    async setEntries(_catalogName, _culture, _entries) {
     }
-    getEntry(_catalogName, _culture, _id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new CacheExpiredError();
-        });
+    async getEntry(_catalogName, _culture, _id) {
+        throw new CacheExpiredError();
     }
 }

package/dist/services/storage/filesystem.cache.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { mkdirSync } from 'node:fs';
 import { readFile, writeFile } from 'node:fs/promises';
 import * as path from 'node:path';
@@ -20,59 +11,51 @@ export class FilesystemCache {
         this.cacheExpirationMs = (_b = settings === null || settings === void 0 ? void 0 : settings.cacheExpirationMs) !== null && _b !== void 0 ? _b : MS_IN_ONE_WEEK;
         mkdirSync(this.path, { recursive: true });
     }
-    setEntries(catalogName, culture, entries) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const filePath = this.getCacheFilePath(catalogName, culture);
-            const formattedEntries = Object.fromEntries(entries.map(({ id, name, name_plurial }) => [id.toString(), {
-                    name,
-                    namePlural: name_plurial,
-                }]));
-            const dump = JSON.stringify({
-                timestamp: Date.now(),
-                cache: formattedEntries,
-            });
-            return writeFile(filePath, dump);
+    async setEntries(catalogName, culture, entries) {
+        const filePath = this.getCacheFilePath(catalogName, culture);
+        const formattedEntries = Object.fromEntries(entries.map(({ id, name, name_plurial }) => [id.toString(), {
+                name,
+                namePlural: name_plurial,
+            }]));
+        const dump = JSON.stringify({
+            timestamp: Date.now(),
+            cache: formattedEntries,
         });
+        return writeFile(filePath, dump);
     }
-    readFileOrThrow(filePath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return yield readFile(filePath, 'utf-8');
-            }
-            catch (_a) {
-                throw new CacheExpiredError();
-            }
-        });
+    async readFileOrThrow(filePath) {
+        try {
+            return await readFile(filePath, 'utf-8');
+        }
+        catch (_a) {
+            throw new CacheExpiredError();
+        }
     }
-    getEntry(catalogName, culture, id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const filePath = this.getCacheFilePath(catalogName, culture);
-            const data = yield this.readFileOrThrow(filePath);
-            const parsed = JSON.parse(data);
-            const currentTimestamp = Date.now();
-            if (parsed.timestamp + this.cacheExpirationMs < currentTimestamp) {
-                throw new CacheExpiredError();
-            }
-            return (_a = parsed.cache[id.toString()]) !== null && _a !== void 0 ? _a : null;
-        });
+    async getEntry(catalogName, culture, id) {
+        var _a;
+        const filePath = this.getCacheFilePath(catalogName, culture);
+        const data = await this.readFileOrThrow(filePath);
+        const parsed = JSON.parse(data);
+        const currentTimestamp = Date.now();
+        if (parsed.timestamp + this.cacheExpirationMs < currentTimestamp) {
+            throw new CacheExpiredError();
+        }
+        return (_a = parsed.cache[id.toString()]) !== null && _a !== void 0 ? _a : null;
     }
-    getEntries(catalogName, culture) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const filePath = this.getCacheFilePath(catalogName, culture);
-            const data = yield this.readFileOrThrow(filePath);
-            const parsed = JSON.parse(data);
-            const currentTimestamp = Date.now();
-            if (parsed.timestamp + this.cacheExpirationMs < currentTimestamp) {
-                throw new CacheExpiredError();
-            }
-            return Object.entries(parsed.cache).map(([id, entry]) => {
-                var _a;
-                return ({
-                    id: Number.parseInt(id, 10),
-                    name: (_a = entry === null || entry === void 0 ? void 0 : entry.name) !== null && _a !== void 0 ? _a : 'missing',
-                    name_plurial: entry === null || entry === void 0 ? void 0 : entry.namePlural,
-                });
+    async getEntries(catalogName, culture) {
+        const filePath = this.getCacheFilePath(catalogName, culture);
+        const data = await this.readFileOrThrow(filePath);
+        const parsed = JSON.parse(data);
+        const currentTimestamp = Date.now();
+        if (parsed.timestamp + this.cacheExpirationMs < currentTimestamp) {
+            throw new CacheExpiredError();
+        }
+        return Object.entries(parsed.cache).map(([id, entry]) => {
+            var _a;
+            return ({
+                id: Number.parseInt(id, 10),
+                name: (_a = entry === null || entry === void 0 ? void 0 : entry.name) !== null && _a !== void 0 ? _a : 'missing',
+                name_plurial: entry === null || entry === void 0 ? void 0 : entry.namePlural,
             });
         });
     }

package/dist/services/storage/memory.cache.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { CacheExpiredError } from './types';
 const MS_IN_ONE_WEEK = 7 * 24 * 60 * 60 * 1000;
 export class MemoryCache {
@@ -15,46 +6,40 @@ export class MemoryCache {
         this.cacheExpirationMs = (_a = settings === null || settings === void 0 ? void 0 : settings.cacheExpirationMs) !== null && _a !== void 0 ? _a : MS_IN_ONE_WEEK;
         this._MEMORY = new Map();
     }
-    setEntries(catalogName, culture, entries) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const memoryEntry = new Map(entries.map(({ id, name, name_plurial }) => [id, {
-                    name,
-                    namePlural: name_plurial,
-                }]));
-            this._MEMORY.set(this.getCacheKey(catalogName, culture), {
-                timestamp: Date.now(),
-                cache: memoryEntry,
-            });
+    async setEntries(catalogName, culture, entries) {
+        const memoryEntry = new Map(entries.map(({ id, name, name_plurial }) => [id, {
+                name,
+                namePlural: name_plurial,
+            }]));
+        this._MEMORY.set(this.getCacheKey(catalogName, culture), {
+            timestamp: Date.now(),
+            cache: memoryEntry,
         });
     }
-    getEntry(catalogName, culture, id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const memoryEntry = this._MEMORY.get(this.getCacheKey(catalogName, culture));
-            if (!memoryEntry) {
-                throw new CacheExpiredError();
-            }
-            if (memoryEntry.timestamp + this.cacheExpirationMs < Date.now()) {
-                throw new CacheExpiredError();
-            }
-            return (_a = memoryEntry.cache.get(id)) !== null && _a !== void 0 ? _a : null;
-        });
+    async getEntry(catalogName, culture, id) {
+        var _a;
+        const memoryEntry = this._MEMORY.get(this.getCacheKey(catalogName, culture));
+        if (!memoryEntry) {
+            throw new CacheExpiredError();
+        }
+        if (memoryEntry.timestamp + this.cacheExpirationMs < Date.now()) {
+            throw new CacheExpiredError();
+        }
+        return (_a = memoryEntry.cache.get(id)) !== null && _a !== void 0 ? _a : null;
     }
-    getEntries(catalogName, culture) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const memoryEntry = this._MEMORY.get(this.getCacheKey(catalogName, culture));
-            if (!memoryEntry) {
-                throw new CacheExpiredError();
-            }
-            if (memoryEntry.timestamp + this.cacheExpirationMs < Date.now()) {
-                throw new CacheExpiredError();
-            }
-            return Array.from(memoryEntry.cache.entries()).map(([id, { name, namePlural }]) => ({
-                id,
-                name,
-                name_plurial: namePlural,
-            }));
-        });
+    async getEntries(catalogName, culture) {
+        const memoryEntry = this._MEMORY.get(this.getCacheKey(catalogName, culture));
+        if (!memoryEntry) {
+            throw new CacheExpiredError();
+        }
+        if (memoryEntry.timestamp + this.cacheExpirationMs < Date.now()) {
+            throw new CacheExpiredError();
+        }
+        return Array.from(memoryEntry.cache.entries()).map(([id, { name, namePlural }]) => ({
+            id,
+            name,
+            name_plurial: namePlural,
+        }));
     }
     getCacheKey(catalogName, culture) {
         return `${catalogName}.${culture}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apimo.js",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "A wrapper for the Apimo API with catalog caching for building custom Real Estate website using their technologies.",
   "author": "Vitaly Lysen <vitaly@lysen.dev> (https://lysen.dev)",
   "license": "MIT",