cloudcommerce 0.0.4 → 0.0.5

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.0.5](https://github.com/ecomplus/cloud-commerce/compare/v0.0.4...v0.0.5) (2022-06-16)
+
+
+### Features
+
+* **api:** Error object (not 2xx) includes `statusCode` property (as Fastify errors) ([a9681f2](https://github.com/ecomplus/cloud-commerce/commit/a9681f23ceb9b007f90e95351ca133fdac865f1b))
+
+
+### Bug Fixes
+
+* **api:** Config object is optional on abstracted method functions ([2eebbe7](https://github.com/ecomplus/cloud-commerce/commit/2eebbe771971b5ac87b85f6068a36d7e1f647aba))
+* **api:** Resolve with resource type on read without method (get is default) ([52b1a9b](https://github.com/ecomplus/cloud-commerce/commit/52b1a9b7cb48210b155ac620eaa6b3c8d95d681e))
+
 ### [0.0.4](https://github.com/ecomplus/cloud-commerce/compare/v0.0.3...v0.0.4) (2022-06-15)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudcommerce",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Open fair-code headless commerce platform: API-first, microservices based, event driven and cloud native",
   "main": "src/index.js",
   "author": "E-Com Club Softwares para E-commerce <ti@e-com.club>",
@@ -13,7 +13,7 @@
     "postinstall": "husky install",
     "build": "turbo run build",
     "test": "turbo run test",
-    "release": "pnpm build && standard-version --commit-all",
+    "release": "pnpm build && pnpm test && standard-version --commit-all",
     "postpublish": "zx scripts/release.mjs --publish"
   },
   "standard-version": {
@@ -36,9 +36,10 @@
     "husky": "^8.0.1",
     "node-fetch": "^3.2.6",
     "standard-version": "^9.5.0",
-    "tsx": "^3.4.2",
     "turbo": "^1.2.16",
     "typescript": "^4.7.3",
+    "vite": "^2.9.12",
+    "vitest": "^0.15.1",
     "zx": "^6.2.5"
   }
 }

package/packages/api/lib/index.d.ts

@@ -0,0 +1,134 @@
+import type { Endpoint, Config, ResponseBody } from './types';
+declare const def: {
+    middleware(config: Config): string;
+};
+declare const setMiddleware: (middleware: (config: Config) => string) => void;
+declare const api: {
+    <T extends Config>(config: T): Promise<Response & {
+        config: Config;
+        data: ResponseBody<T>;
+    }>;
+    get: <E extends Endpoint, C extends AbstractedConfig>(endpoint: E, config?: C | undefined) => Promise<Response & {
+        config: Config;
+        data: {
+            endpoint: E;
+        } extends infer T_1 ? T_1 extends {
+            endpoint: E;
+        } ? T_1 extends Config & {
+            method?: "get" | undefined;
+            endpoint: `products/${string}`;
+        } ? import("./types").Products : T_1 extends Config & {
+            method?: "get" | undefined;
+            endpoint: `categories/${string}`;
+        } ? import("./types").Categories : T_1 extends Config & {
+            method?: "get" | undefined;
+            endpoint: `brands/${string}`;
+        } ? import("./types").Brands : T_1 extends Config & {
+            method?: "get" | undefined;
+            endpoint: `collections/${string}`;
+        } ? import("./types").Collections : T_1 extends Config & {
+            method?: "get" | undefined;
+            endpoint: `grids/${string}`;
+        } ? import("./types").Grids : T_1 extends Config & {
+            method?: "get" | undefined;
+            endpoint: `carts/${string}`;
+        } ? import("./types").Carts : T_1 extends Config & {
+            method?: "get" | undefined;
+            endpoint: `orders/${string}`;
+        } ? import("./types").Orders : T_1 extends Config & {
+            method?: "get" | undefined;
+            endpoint: `customers/${string}`;
+        } ? import("./types").Customers : T_1 extends Config & {
+            method?: "get" | undefined;
+            endpoint: `stores/${string}`;
+        } ? import("./types").Stores : T_1 extends Config & {
+            method?: "get" | undefined;
+            endpoint: `applications/${string}`;
+        } ? import("./types").Applications : any : never : never;
+    }>;
+    post: (endpoint: Endpoint, config?: AbstractedConfig) => Promise<Response & {
+        config: Config;
+        data: {
+            _id: string & {
+                length: 24;
+            };
+        };
+    }>;
+    put: (endpoint: Endpoint, config?: AbstractedConfig) => Promise<Response & {
+        config: Config;
+        data: null;
+    }>;
+    patch: (endpoint: Endpoint, config?: AbstractedConfig) => Promise<Response & {
+        config: Config;
+        data: null;
+    }>;
+    del: (endpoint: Endpoint, config?: AbstractedConfig) => Promise<Response & {
+        config: Config;
+        data: null;
+    }>;
+    delete: (endpoint: Endpoint, config?: AbstractedConfig) => Promise<Response & {
+        config: Config;
+        data: null;
+    }>;
+};
+declare type AbstractedConfig = Omit<Config, 'endpoint' | 'method'>;
+declare const get: <E extends Endpoint, C extends AbstractedConfig>(endpoint: E, config?: C | undefined) => Promise<Response & {
+    config: Config;
+    data: {
+        endpoint: E;
+    } extends infer T_1 ? T_1 extends {
+        endpoint: E;
+    } ? T_1 extends Config & {
+        method?: "get" | undefined;
+        endpoint: `products/${string}`;
+    } ? import("./types").Products : T_1 extends Config & {
+        method?: "get" | undefined;
+        endpoint: `categories/${string}`;
+    } ? import("./types").Categories : T_1 extends Config & {
+        method?: "get" | undefined;
+        endpoint: `brands/${string}`;
+    } ? import("./types").Brands : T_1 extends Config & {
+        method?: "get" | undefined;
+        endpoint: `collections/${string}`;
+    } ? import("./types").Collections : T_1 extends Config & {
+        method?: "get" | undefined;
+        endpoint: `grids/${string}`;
+    } ? import("./types").Grids : T_1 extends Config & {
+        method?: "get" | undefined;
+        endpoint: `carts/${string}`;
+    } ? import("./types").Carts : T_1 extends Config & {
+        method?: "get" | undefined;
+        endpoint: `orders/${string}`;
+    } ? import("./types").Orders : T_1 extends Config & {
+        method?: "get" | undefined;
+        endpoint: `customers/${string}`;
+    } ? import("./types").Customers : T_1 extends Config & {
+        method?: "get" | undefined;
+        endpoint: `stores/${string}`;
+    } ? import("./types").Stores : T_1 extends Config & {
+        method?: "get" | undefined;
+        endpoint: `applications/${string}`;
+    } ? import("./types").Applications : any : never : never;
+}>;
+declare const post: (endpoint: Endpoint, config?: AbstractedConfig) => Promise<Response & {
+    config: Config;
+    data: {
+        _id: string & {
+            length: 24;
+        };
+    };
+}>;
+declare const put: (endpoint: Endpoint, config?: AbstractedConfig) => Promise<Response & {
+    config: Config;
+    data: null;
+}>;
+declare const patch: (endpoint: Endpoint, config?: AbstractedConfig) => Promise<Response & {
+    config: Config;
+    data: null;
+}>;
+declare const del: (endpoint: Endpoint, config?: AbstractedConfig) => Promise<Response & {
+    config: Config;
+    data: null;
+}>;
+export default api;
+export { setMiddleware, get, post, put, patch, del, };

package/packages/api/lib/index.js

@@ -0,0 +1,89 @@
+// @ts-ignore
+const env = (typeof window === 'object' && window)
+    || (typeof process === 'object' && process && process.env)
+    || {};
+const def = {
+  middleware(config) {
+    let url = config.baseUrl || env.API_BASE_URL || 'https://ecomplus.io/v2';
+    const storeId = config.storeId || env.ECOM_STORE_ID;
+    if (!storeId) {
+      throw new Error('`storeId` must be set in config or `ECOM_STORE_ID` env var');
+    }
+    url += `/:${storeId}`;
+    const lang = config.lang || env.ECOM_LANG;
+    if (lang) {
+      url += `,lang:${lang}`;
+    }
+    if (config.params) {
+      if (typeof config.params === 'string') {
+        url += `?${config.params}`;
+      } else {
+        // https://github.com/microsoft/TypeScript/issues/32951
+        url += `?${new URLSearchParams(config.params)}`;
+      }
+    }
+    return `${url}/${config.endpoint}`;
+  },
+};
+// eslint-disable-next-line no-unused-vars
+const setMiddleware = (middleware) => {
+  def.middleware = middleware;
+};
+const api = async (config) => {
+  const url = def.middleware(config);
+  const { method, headers, timeout = 20000 } = config;
+  const abortController = new AbortController();
+  const timer = setTimeout(() => abortController.abort(), timeout);
+  const response = await fetch(url, {
+    method,
+    headers,
+    signal: abortController.signal,
+  });
+  clearTimeout(timer);
+  if (response.ok) {
+    return {
+      ...response,
+      config,
+      data: await response.json(),
+    };
+  }
+  const error = new Error(response.statusText);
+  error.config = config;
+  error.response = response;
+  error.statusCode = response.status;
+  throw error;
+};
+const get = (endpoint, config) => api({ ...config, endpoint });
+const post = (endpoint, config) => api({
+  ...config,
+  method: 'post',
+  endpoint,
+});
+const put = (endpoint, config) => api({
+  ...config,
+  method: 'put',
+  endpoint,
+});
+const patch = (endpoint, config) => api({
+  ...config,
+  method: 'patch',
+  endpoint,
+});
+const del = (endpoint, config) => api({
+  ...config,
+  method: 'delete',
+  endpoint,
+});
+api.get = get;
+api.post = post;
+api.put = put;
+api.patch = patch;
+api.del = del;
+api.delete = del;
+
+export default api;
+
+export {
+  setMiddleware, get, post, put, patch, del,
+};
+// # sourceMappingURL=index.js.map

package/packages/api/{dist → lib}/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/packages/api/{dist → lib}/types.d.ts

@@ -19,47 +19,21 @@ declare type Config = {
     baseUrl?: string;
     storeId?: number;
     lang?: string;
-    method: Method;
+    method?: Method;
     endpoint: Endpoint;
     params?: Record<string, string | number>;
     headers?: Record<string, string>;
     timeout?: number;
 };
+declare type ReadConfig<endpoint> = Config & {
+    method?: 'get';
+    endpoint: endpoint;
+};
 declare type ResponseBody<T> = T extends Config & {
     method: 'post';
 } ? {
     _id: ResourceId;
 } : T extends Config & {
     method: 'put' | 'patch' | 'delete';
-} ? null : T extends Config & {
-    method: 'get';
-    endpoint: `products/${ResourceId}`;
-} ? Products : T extends Config & {
-    method: 'get';
-    endpoint: `categories/${ResourceId}`;
-} ? Categories : T extends Config & {
-    method: 'get';
-    endpoint: `brands/${ResourceId}`;
-} ? Brands : T extends Config & {
-    method: 'get';
-    endpoint: `collections/${ResourceId}`;
-} ? Collections : T extends Config & {
-    method: 'get';
-    endpoint: `grids/${ResourceId}`;
-} ? Grids : T extends Config & {
-    method: 'get';
-    endpoint: `carts/${ResourceId}`;
-} ? Carts : T extends Config & {
-    method: 'get';
-    endpoint: `orders/${ResourceId}`;
-} ? Orders : T extends Config & {
-    method: 'get';
-    endpoint: `customers/${ResourceId}`;
-} ? Customers : T extends Config & {
-    method: 'get';
-    endpoint: `stores/${ResourceId}`;
-} ? Stores : T extends Config & {
-    method: 'get';
-    endpoint: `applications/${ResourceId}`;
-} ? Applications : any;
+} ? null : T extends ReadConfig<`products/${ResourceId}`> ? Products : T extends ReadConfig<`categories/${ResourceId}`> ? Categories : T extends ReadConfig<`brands/${ResourceId}`> ? Brands : T extends ReadConfig<`collections/${ResourceId}`> ? Collections : T extends ReadConfig<`grids/${ResourceId}`> ? Grids : T extends ReadConfig<`carts/${ResourceId}`> ? Carts : T extends ReadConfig<`orders/${ResourceId}`> ? Orders : T extends ReadConfig<`customers/${ResourceId}`> ? Customers : T extends ReadConfig<`stores/${ResourceId}`> ? Stores : T extends ReadConfig<`applications/${ResourceId}`> ? Applications : any;
 export type { Products, Categories, Brands, Collections, Grids, Carts, Orders, Customers, Stores, Applications, Resource, ResourceAndId, Endpoint, Method, Config, ResponseBody, };

package/packages/api/lib/types.js

@@ -0,0 +1,2 @@
+export {};
+// # sourceMappingURL=types.js.map

package/packages/api/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@cloudcommerce/api",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "E-Com Plus Cloud Commerce APIs client/adapter",
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ecomplus/cloud-commerce.git",
@@ -16,7 +16,7 @@
   },
   "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/api#readme",
   "scripts": {
-    "build": "zx scripts/build.mjs",
-    "test": "zx scripts/test.mjs"
+    "build": "sh scripts/build.sh",
+    "test": "tsc -p ../../tsconfig.test.json && vitest run"
   }
 }

package/packages/api/scripts/build.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm -rf lib
+tsc --outDir lib
+cp -r src/types lib/
+npx eslint --rule 'max-len: off' --ext .js lib --fix

package/packages/api/src/index.ts

@@ -34,7 +34,7 @@ const setMiddleware = (middleware: typeof def.middleware) => {
   def.middleware = middleware;
 };
 
-const callApi = async <T extends Config>(config: T): Promise<Response & {
+const api = async <T extends Config>(config: T): Promise<Response & {
   config: Config,
   data: ResponseBody<T>,
 }> => {
@@ -58,47 +58,52 @@ const callApi = async <T extends Config>(config: T): Promise<Response & {
   const error: any = new Error(response.statusText);
   error.config = config;
   error.response = response;
+  error.statusCode = response.status;
   throw error;
 };
 
-const get = (endpoint: Endpoint, config: Exclude<Config, 'method'>) => callApi({
-  ...config,
-  method: 'get',
-  endpoint,
-});
+type AbstractedConfig = Omit<Config, 'endpoint' | 'method'>;
+
+const get = <E extends Endpoint, C extends AbstractedConfig>(
+  endpoint: E,
+  config?: C,
+): Promise<Response & {
+  config: Config,
+  data: ResponseBody<{ endpoint: E }>,
+}> => api({ ...config, endpoint });
 
-const post = (endpoint: Endpoint, config: Exclude<Config, 'method'>) => callApi({
+const post = (endpoint: Endpoint, config?: AbstractedConfig) => api({
   ...config,
   method: 'post',
   endpoint,
 });
 
-const put = (endpoint: Endpoint, config: Exclude<Config, 'method'>) => callApi({
+const put = (endpoint: Endpoint, config?: AbstractedConfig) => api({
   ...config,
   method: 'put',
   endpoint,
 });
 
-const patch = (endpoint: Endpoint, config: Exclude<Config, 'method'>) => callApi({
+const patch = (endpoint: Endpoint, config?: AbstractedConfig) => api({
   ...config,
   method: 'patch',
   endpoint,
 });
 
-const del = (endpoint: Endpoint, config: Exclude<Config, 'method'>) => callApi({
+const del = (endpoint: Endpoint, config?: AbstractedConfig) => api({
   ...config,
   method: 'delete',
   endpoint,
 });
 
-callApi.get = get;
-callApi.post = post;
-callApi.put = put;
-callApi.patch = patch;
-callApi.del = del;
-callApi.delete = del;
+api.get = get;
+api.post = post;
+api.put = put;
+api.patch = patch;
+api.del = del;
+api.delete = del;
 
-export default callApi;
+export default api;
 
 export {
   setMiddleware,

package/packages/api/src/types.ts

@@ -32,26 +32,28 @@ type Config = {
   baseUrl?: string,
   storeId?: number,
   lang?: string,
-  method: Method,
+  method?: Method,
   endpoint: Endpoint,
   params?: Record<string, string | number>,
   headers?: Record<string, string>,
   timeout?: number,
 };
 
+type ReadConfig<endpoint> = Config & { method?: 'get', endpoint: endpoint };
+
 type ResponseBody<T> =
   T extends Config & { method: 'post' } ? { _id: ResourceId } :
   T extends Config & { method: 'put' | 'patch' | 'delete' } ? null :
-  T extends Config & { method: 'get', endpoint: `products/${ResourceId}` } ? Products :
-  T extends Config & { method: 'get', endpoint: `categories/${ResourceId}` } ? Categories :
-  T extends Config & { method: 'get', endpoint: `brands/${ResourceId}` } ? Brands :
-  T extends Config & { method: 'get', endpoint: `collections/${ResourceId}` } ? Collections :
-  T extends Config & { method: 'get', endpoint: `grids/${ResourceId}` } ? Grids :
-  T extends Config & { method: 'get', endpoint: `carts/${ResourceId}` } ? Carts :
-  T extends Config & { method: 'get', endpoint: `orders/${ResourceId}` } ? Orders :
-  T extends Config & { method: 'get', endpoint: `customers/${ResourceId}` } ? Customers :
-  T extends Config & { method: 'get', endpoint: `stores/${ResourceId}` } ? Stores :
-  T extends Config & { method: 'get', endpoint: `applications/${ResourceId}` } ? Applications :
+  T extends ReadConfig<`products/${ResourceId}`> ? Products :
+  T extends ReadConfig<`categories/${ResourceId}`> ? Categories :
+  T extends ReadConfig<`brands/${ResourceId}`> ? Brands :
+  T extends ReadConfig<`collections/${ResourceId}`> ? Collections :
+  T extends ReadConfig<`grids/${ResourceId}`> ? Grids :
+  T extends ReadConfig<`carts/${ResourceId}`> ? Carts :
+  T extends ReadConfig<`orders/${ResourceId}`> ? Orders :
+  T extends ReadConfig<`customers/${ResourceId}`> ? Customers :
+  T extends ReadConfig<`stores/${ResourceId}`> ? Stores :
+  T extends ReadConfig<`applications/${ResourceId}`> ? Applications :
   any
 
 export type {

package/packages/api/tests/index.test.ts

@@ -1,14 +1,30 @@
-/* eslint-disable no-console */
+/* eslint-disable no-console, import/no-extraneous-dependencies */
+
+import { test, expect } from 'vitest';
 import './fetch-polyfill';
-import callApi from '../src/index';
+import api from '../src/index';
 
-callApi({
-  storeId: 1056,
-  method: 'get',
-  endpoint: 'products/618041aa239b7206d3fc06de',
-}).then(({ data }) => {
-  if (data.sku === 'string') {
+const productId = '618041aa239b7206d3fc06de';
+test('Read product and typecheck SKU', async () => {
+  const { data } = await api({
+    storeId: 1056,
+    endpoint: `products/${productId}`,
+  });
+  if (data.sku === '123') {
     console.log('\\o/');
   }
-  console.info(`✓ Read product ${data.sku} and checked SKU type string`);
+  expect(data.sku).toBeTypeOf('string');
+  expect(data._id).toBe(productId);
+});
+
+test('404 with different Store ID from env', async () => {
+  process.env.ECOM_STORE_ID = '1011';
+  try {
+    const { data } = await api.get(`products/${productId}`);
+    console.log(data);
+    throw new Error('Should have thrown not found');
+  } catch (error: any) {
+    expect(error.statusCode).toBe(404);
+    expect(error.response?.status).toBe(404);
+  }
 });

package/packages/api/tsconfig.json

@@ -0,0 +1,6 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declaration": true
+  }
+}

package/packages/apps/discounts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudcommerce/app-discounts",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "E-Com Plus Cloud Commerce app for complex discount rules",
   "main": "functions/dist/index.js",
   "repository": {

package/packages/storefront/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudcommerce/storefront",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
   "main": "src/index.js",
   "repository": {
@@ -18,6 +18,7 @@
     "build": "echo '@ecomplus/storefront'"
   },
   "dependencies": {
-    "@cloudcommerce/api": "workspace:*"
+    "@cloudcommerce/api": "workspace:*",
+    "astro": "1.0.0-beta.46"
   }
 }

package/tsconfig.json

@@ -99,8 +99,9 @@
     "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
   },
   "exclude": [
-    "**/dist/**",
     "**/node_modules/**",
+    "**/dist/**",
+    "**/scripts/**",
     "**/tests/**"
   ]
 }

package/tsconfig.test.json

@@ -1,106 +1,11 @@
 {
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    /* Visit https://aka.ms/tsconfig.json to read more about this file */
-
-    /* Projects */
-    // "incremental": true,                              /* Enable incremental compilation */
-    // "composite": true,                                /* Enable constraints that allow a TypeScript project to be used with project references. */
-    // "tsBuildInfoFile": "./",                          /* Specify the folder for .tsbuildinfo incremental compilation files. */
-    // "disableSourceOfProjectReferenceRedirect": true,  /* Disable preferring source files instead of declaration files when referencing composite projects */
-    // "disableSolutionSearching": true,                 /* Opt a project out of multi-project reference checking when editing. */
-    // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
-
-    /* Language and Environment */
-    "target": "es2020",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
-    // "jsx": "preserve",                                /* Specify what JSX code is generated. */
-    // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
-    // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
-    // "jsxFactory": "",                                 /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */
-    // "jsxFragmentFactory": "",                         /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
-    // "jsxImportSource": "",                            /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */
-    // "reactNamespace": "",                             /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */
-    // "noLib": true,                                    /* Disable including any library files, including the default lib.d.ts. */
-    // "useDefineForClassFields": true,                  /* Emit ECMAScript-standard-compliant class fields. */
-
-    /* Modules */
-    "module": "es2020",                                  /* Specify what module code is generated. */
-    // "rootDir": "src",                                 /* Specify the root folder within your source files. */
-    "moduleResolution": "node",                          /* Specify how TypeScript looks up a file from a given module specifier. */
-    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
-    // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
-    // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
-    // "typeRoots": ["lib/app/src/@types"],              /* Specify multiple folders that act like `./node_modules/@types`. */
-    // "types": [],                                      /* Specify type package names to be included without being referenced in a source file. */
-    // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
-    "resolveJsonModule": true,                           /* Enable importing .json files */
-    // "noResolve": true,                                /* Disallow `import`s, `require`s or `<reference>`s from expanding the number of files TypeScript should add to a project. */
-
-    /* JavaScript Support */
-    // "allowJs": true,                                  /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
-    // "checkJs": true,                                  /* Enable error reporting in type-checked JavaScript files. */
-    // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */
-
-    /* Emit */
-    // "declaration": true,                              /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
-    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
-    // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
-    "sourceMap": true,                                   /* Create source map files for emitted JavaScript files. */
-    // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
-    // "outDir": "dist",                                 /* Specify an output folder for all emitted files. */
-    "removeComments": false,                             /* Disable emitting comments. */
-    "noEmit": true,                                      /* Disable emitting files from a compilation. */
-    // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
-    // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types */
-    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
-    // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
-    // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
-    // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
-    // "inlineSources": true,                            /* Include source code in the sourcemaps inside the emitted JavaScript. */
-    // "emitBOM": true,                                  /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
-    "newLine": "lf",                                     /* Set the newline character for emitting files. */
-    // "stripInternal": true,                            /* Disable emitting declarations that have `@internal` in their JSDoc comments. */
-    // "noEmitHelpers": true,                            /* Disable generating custom helper functions like `__extends` in compiled output. */
-    "noEmitOnError": true,                               /* Disable emitting files if any type checking errors are reported. */
-    // "preserveConstEnums": true,                       /* Disable erasing `const enum` declarations in generated code. */
-    // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
-    // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
-
-    /* Interop Constraints */
-    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
-    // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
-    "esModuleInterop": true,                             /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */
-    // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
-    "forceConsistentCasingInFileNames": true,            /* Ensure that casing is correct in imports. */
-
-    /* Type Checking */
-    "strict": true,                                      /* Enable all strict type-checking options. */
-    "noImplicitAny": true,                               /* Enable error reporting for expressions and declarations with an implied `any` type.. */
-    // "strictNullChecks": true,                         /* When type checking, take into account `null` and `undefined`. */
-    // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
-    // "strictBindCallApply": true,                      /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */
-    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
-    // "noImplicitThis": true,                           /* Enable error reporting when `this` is given the type `any`. */
-    // "useUnknownInCatchVariables": true,               /* Type catch clause variables as 'unknown' instead of 'any'. */
-    // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */
-    // "noUnusedLocals": true,                           /* Enable error reporting when a local variables aren't read. */
-    // "noUnusedParameters": true,                       /* Raise an error when a function parameter isn't read */
-    // "exactOptionalPropertyTypes": true,               /* Interpret optional property types as written, rather than adding 'undefined'. */
-    // "noImplicitReturns": true,                        /* Enable error reporting for codepaths that do not explicitly return in a function. */
-    // "noFallthroughCasesInSwitch": true,               /* Enable error reporting for fallthrough cases in switch statements. */
-    // "noUncheckedIndexedAccess": true,                 /* Include 'undefined' in index signature results */
-    // "noImplicitOverride": true,                       /* Ensure overriding members in derived classes are marked with an override modifier. */
-    // "noPropertyAccessFromIndexSignature": true,       /* Enforces using indexed accessors for keys declared using an indexed type */
-    // "allowUnusedLabels": true,                        /* Disable error reporting for unused labels. */
-    // "allowUnreachableCode": true,                     /* Disable error reporting for unreachable code. */
-
-    /* Completeness */
-    // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
-    "skipLibCheck": true                                 /* Skip type checking all .d.ts files. */
+    "noEmit": true
   },
+  "include": [
+    "packages/*/tests/**/*.ts"
+  ],
   "exclude": [
-    "**/dist/**",
-    "**/node_modules/**",
-    "**/src/**"
   ]
 }

package/turbo.json

@@ -13,5 +13,10 @@
     "test": {
       "outputs": []
     }
-  }
+  },
+  "globalDependencies": [
+    ".env",
+    "tsconfig.json",
+    "vite.config.ts"
+  ]
 }

package/vite.config.ts

@@ -0,0 +1,12 @@
+/* eslint-disable import/no-extraneous-dependencies */
+/// <reference types="vitest" />
+// Configure Vitest (https://vitest.dev/config/)
+
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  test: {
+    globals: true,
+    reporters: 'verbose',
+  },
+});

package/packages/api/dist/index.d.ts

@@ -1,65 +0,0 @@
-import type { Endpoint, Config, ResponseBody } from './types';
-declare const def: {
-    middleware(config: Config): string;
-};
-declare const setMiddleware: (middleware: (config: Config) => string) => void;
-declare const callApi: {
-    <T extends Config>(config: T): Promise<Response & {
-        config: Config;
-        data: ResponseBody<T>;
-    }>;
-    get: (endpoint: Endpoint, config: Exclude<Config, 'method'>) => Promise<Response & {
-        config: Config;
-        data: any;
-    }>;
-    post: (endpoint: Endpoint, config: Exclude<Config, 'method'>) => Promise<Response & {
-        config: Config;
-        data: {
-            _id: string & {
-                length: 24;
-            };
-        };
-    }>;
-    put: (endpoint: Endpoint, config: Exclude<Config, 'method'>) => Promise<Response & {
-        config: Config;
-        data: null;
-    }>;
-    patch: (endpoint: Endpoint, config: Exclude<Config, 'method'>) => Promise<Response & {
-        config: Config;
-        data: null;
-    }>;
-    del: (endpoint: Endpoint, config: Exclude<Config, 'method'>) => Promise<Response & {
-        config: Config;
-        data: null;
-    }>;
-    delete: (endpoint: Endpoint, config: Exclude<Config, 'method'>) => Promise<Response & {
-        config: Config;
-        data: null;
-    }>;
-};
-declare const get: (endpoint: Endpoint, config: Exclude<Config, 'method'>) => Promise<Response & {
-    config: Config;
-    data: any;
-}>;
-declare const post: (endpoint: Endpoint, config: Exclude<Config, 'method'>) => Promise<Response & {
-    config: Config;
-    data: {
-        _id: string & {
-            length: 24;
-        };
-    };
-}>;
-declare const put: (endpoint: Endpoint, config: Exclude<Config, 'method'>) => Promise<Response & {
-    config: Config;
-    data: null;
-}>;
-declare const patch: (endpoint: Endpoint, config: Exclude<Config, 'method'>) => Promise<Response & {
-    config: Config;
-    data: null;
-}>;
-declare const del: (endpoint: Endpoint, config: Exclude<Config, 'method'>) => Promise<Response & {
-    config: Config;
-    data: null;
-}>;
-export default callApi;
-export { setMiddleware, get, post, put, patch, del, };

package/packages/api/dist/index.js

@@ -1,89 +0,0 @@
-// @ts-ignore
-const env = (typeof window === 'object' && window)
-    || (typeof process === 'object' && process && process.env)
-    || {};
-const def = {
-    middleware(config) {
-        let url = config.baseUrl || env.API_BASE_URL || 'https://ecomplus.io/v2';
-        const storeId = config.storeId || env.ECOM_STORE_ID;
-        if (!storeId) {
-            throw new Error('`storeId` must be set in config or `ECOM_STORE_ID` env var');
-        }
-        url += `/:${storeId}`;
-        const lang = config.lang || env.ECOM_LANG;
-        if (lang) {
-            url += `,lang:${lang}`;
-        }
-        if (config.params) {
-            if (typeof config.params === 'string') {
-                url += `?${config.params}`;
-            }
-            else {
-                // https://github.com/microsoft/TypeScript/issues/32951
-                url += `?${new URLSearchParams(config.params)}`;
-            }
-        }
-        return `${url}/${config.endpoint}`;
-    },
-};
-// eslint-disable-next-line no-unused-vars
-const setMiddleware = (middleware) => {
-    def.middleware = middleware;
-};
-const callApi = async (config) => {
-    const url = def.middleware(config);
-    const { method, headers, timeout = 20000 } = config;
-    const abortController = new AbortController();
-    const timer = setTimeout(() => abortController.abort(), timeout);
-    const response = await fetch(url, {
-        method,
-        headers,
-        signal: abortController.signal,
-    });
-    clearTimeout(timer);
-    if (response.ok) {
-        return {
-            ...response,
-            config,
-            data: await response.json(),
-        };
-    }
-    const error = new Error(response.statusText);
-    error.config = config;
-    error.response = response;
-    throw error;
-};
-const get = (endpoint, config) => callApi({
-    ...config,
-    method: 'get',
-    endpoint,
-});
-const post = (endpoint, config) => callApi({
-    ...config,
-    method: 'post',
-    endpoint,
-});
-const put = (endpoint, config) => callApi({
-    ...config,
-    method: 'put',
-    endpoint,
-});
-const patch = (endpoint, config) => callApi({
-    ...config,
-    method: 'patch',
-    endpoint,
-});
-const del = (endpoint, config) => callApi({
-    ...config,
-    method: 'delete',
-    endpoint,
-});
-callApi.get = get;
-callApi.post = post;
-callApi.put = put;
-callApi.patch = patch;
-callApi.del = del;
-callApi.delete = del;
-export default callApi;
-export { setMiddleware, get, post, put, patch, del, };
-//# sourceMappingURL=index.js.map

package/packages/api/dist/types.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=types.js.map

package/packages/api/scripts/build.mjs

@@ -1,5 +0,0 @@
-/* global $ */
-
-await $`rm -rf dist`;
-await $`tsc -p ../../tsconfig.json --outDir dist --declaration`;
-await $`cp -r src/types dist/`;

package/packages/api/scripts/test.mjs

@@ -1,4 +0,0 @@
-/* global $ */
-
-await $`tsc -p ../../tsconfig.test.json`;
-await $`tsx tests/index.test.ts`;