@cntrl-site/sdk 0.2.7 → 0.2.9

package/lib/Client/Client.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = void 0;
 const core_1 = require("@cntrl-site/core");
 const isomorphic_fetch_1 = __importDefault(require("isomorphic-fetch"));
+const url_1 = require("url");
 class Client {
     constructor(projectId, APIUrl, fetchImpl = isomorphic_fetch_1.default) {
         this.projectId = projectId;
@@ -19,7 +20,8 @@ class Client {
         }
     }
     async getProject() {
-        const response = await this.fetchImpl(`${this.APIUrl}/projects/${this.projectId}`);
+        const projectUrl = new url_1.URL(`/projects/${this.projectId}`, this.APIUrl);
+        const response = await this.fetchImpl(projectUrl.href);
         if (!response.ok) {
             throw new Error(`Failed to fetch project with id #${this.projectId}: ${response.statusText}`);
         }
@@ -28,7 +30,8 @@ class Client {
         return project;
     }
     async getPageArticle(pageSlug) {
-        const projectResponse = await this.fetchImpl(`${this.APIUrl}/projects/${this.projectId}`);
+        const projectUrl = new url_1.URL(`/projects/${this.projectId}`, this.APIUrl);
+        const projectResponse = await this.fetchImpl(projectUrl.href);
         if (!projectResponse.ok) {
             throw new Error(`Failed to fetch project with id #${this.projectId}: ${projectResponse.statusText}`);
         }
@@ -38,7 +41,8 @@ class Client {
         if (!page) {
             throw new Error(`Page with a slug ${pageSlug} was not found in project with id #${this.projectId}`);
         }
-        const articleResponse = await this.fetchImpl(`${this.APIUrl}/articles/${page.articleId}`);
+        const url = new url_1.URL(`/articles/${page.articleId}`, this.APIUrl);
+        const articleResponse = await this.fetchImpl(url.href);
         if (!articleResponse.ok) {
             throw new Error(`Failed to fetch article with id #${page.articleId}: ${articleResponse.statusText}`);
         }

package/lib/utils.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLayoutStyles = void 0;
-const core_1 = require("@cntrl-site/core");
 function getLayoutStyles(layouts, layoutValues, mapToStyles) {
     const mediaQueries = layouts
         .sort((a, b) => a.startsWith - b.startsWith)
         .reduce((acc, layout) => {
-        const values = layoutValues.map(lv => lv[layout.id] ?? (0, core_1.getClosestLayoutValue)(lv, layouts, layout.id));
+        const values = layoutValues.map(lv => lv[layout.id]);
         return `
         ${acc}
         ${layout.startsWith !== 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cntrl-site/sdk",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "Generic SDK for use in public websites.",
   "main": "lib/index.js",
   "types": "src/index.ts",
@@ -24,14 +24,16 @@
     "lib": "lib"
   },
   "dependencies": {
-    "@cntrl-site/core": "^1.7.1",
+    "@cntrl-site/core": "^1.7.5",
     "@types/isomorphic-fetch": "^0.0.36",
-    "isomorphic-fetch": "^3.0.0"
+    "isomorphic-fetch": "^3.0.0",
+    "url": "^0.11.0"
   },
   "devDependencies": {
     "@tsconfig/node16": "^1.0.3",
     "@tsconfig/recommended": "^1.0.1",
     "@types/jest": "^29.0.0",
+    "@types/node": "^18.11.7",
     "jest": "^28.1.3",
     "ts-jest": "^28.0.8",
     "typescript": "^4.7.4"

package/src/Client/Client.ts

@@ -1,5 +1,6 @@
 import { TProject, ProjectSchema, TArticle, ArticleSchema, TMeta, TPageMeta } from '@cntrl-site/core';
 import fetch from 'isomorphic-fetch';
+import { URL } from 'url';
 
 export class Client {
   constructor(
@@ -16,7 +17,8 @@ export class Client {
   }
 
   async getProject(): Promise<TProject> {
-    const response = await this.fetchImpl(`${this.APIUrl}/projects/${this.projectId}`);
+    const projectUrl = new URL(`/projects/${this.projectId}`, this.APIUrl);
+    const response = await this.fetchImpl(projectUrl.href);
     if (!response.ok) {
       throw new Error(`Failed to fetch project with id #${this.projectId}: ${response.statusText}`);
     }
@@ -26,7 +28,8 @@ export class Client {
   }
 
   async getPageArticle(pageSlug: string): Promise<TArticle> {
-    const projectResponse = await this.fetchImpl(`${this.APIUrl}/projects/${this.projectId}`);
+    const projectUrl = new URL(`/projects/${this.projectId}`, this.APIUrl);
+    const projectResponse = await this.fetchImpl(projectUrl.href);
     if (!projectResponse.ok) {
       throw new Error(`Failed to fetch project with id #${this.projectId}: ${projectResponse.statusText}`);
     }
@@ -36,8 +39,8 @@ export class Client {
     if (!page) {
       throw new Error(`Page with a slug ${pageSlug} was not found in project with id #${this.projectId}`);
     }
-
-    const articleResponse = await this.fetchImpl(`${this.APIUrl}/articles/${page.articleId}`);
+    const url = new URL(`/articles/${page.articleId}`, this.APIUrl);
+    const articleResponse = await this.fetchImpl(url.href);
     if (!articleResponse.ok) {
       throw new Error(`Failed to fetch article with id #${page.articleId}: ${articleResponse.statusText}`);
     }

package/src/utils.ts

@@ -1,4 +1,4 @@
-import { TLayout, getClosestLayoutValue } from '@cntrl-site/core';
+import { TLayout } from '@cntrl-site/core';
 
 export function getLayoutStyles<V, M> (
   layouts: TLayout[],
@@ -8,7 +8,7 @@ export function getLayoutStyles<V, M> (
   const mediaQueries = layouts
     .sort((a, b) => a.startsWith - b.startsWith)
     .reduce((acc, layout) => {
-      const values = layoutValues.map(lv => lv[layout.id] ?? getClosestLayoutValue(lv, layouts, layout.id));
+      const values = layoutValues.map(lv => lv[layout.id]);
       return `
         ${acc}
         ${layout.startsWith !== 0