@cmssy/core 16.1.1 → 16.2.1

package/dist/index.cjs

@@ -465,6 +465,26 @@ async function resolveWorkspaceId(config, options = {}) {
   }
   return siteConfig.workspaceId;
 }
+var MAX_ENTRIES = 64;
+var workspaceIdCache = /* @__PURE__ */ new Map();
+function cacheKey(config) {
+  return `${resolveApiUrl(config.apiUrl)}::${config.org}::${config.workspaceSlug}`;
+}
+function cachedWorkspaceId(config, options = {}) {
+  const key = cacheKey(config);
+  const existing = workspaceIdCache.get(key);
+  if (existing) return existing;
+  const fresh = resolveWorkspaceId(config, options).catch((err) => {
+    workspaceIdCache.delete(key);
+    throw err;
+  });
+  if (workspaceIdCache.size >= MAX_ENTRIES) workspaceIdCache.clear();
+  workspaceIdCache.set(key, fresh);
+  return fresh;
+}
+function primeWorkspaceId(config, workspaceId) {
+  workspaceIdCache.set(cacheKey(config), Promise.resolve(workspaceId));
+}
 
 // src/data/client.ts
 function createCmssyClient(input) {
@@ -472,19 +492,8 @@ function createCmssyClient(input) {
     ...input,
     apiUrl: resolveApiUrl(input.apiUrl)
   };
-  let cachedWorkspaceId;
-  let inFlight;
   function resolveWorkspaceId2(options) {
-    if (cachedWorkspaceId) return Promise.resolve(cachedWorkspaceId);
-    if (!inFlight) {
-      inFlight = resolveWorkspaceId(config, options).then((id) => {
-        cachedWorkspaceId = id;
-        return id;
-      }).finally(() => {
-        inFlight = void 0;
-      });
-    }
-    return inFlight;
+    return cachedWorkspaceId(config, options);
   }
   function query(document2, variables, options) {
     return graphqlRequest(
@@ -515,7 +524,11 @@ function createCmssyClient(input) {
   const client = {
     config,
     resolveWorkspaceId: resolveWorkspaceId2,
-    query: ((document2, variables = {}, options) => query(documentText(document2), variables, options)),
+    query: ((document2, variables = {}, options) => query(
+      documentText(document2),
+      variables,
+      options
+    )),
     queryScoped: ((document2, variables = {}, options = {}) => queryScoped(
       documentText(document2),
       variables,
@@ -712,7 +725,7 @@ function localizeHref(href, locale) {
 // src/data/site-locales.ts
 var TTL_MS = 6e4;
 var FAILURE_TTL_MS = 5e3;
-var MAX_ENTRIES = 64;
+var MAX_ENTRIES2 = 64;
 var cache = /* @__PURE__ */ new Map();
 function localesFromSiteConfig(siteConfig) {
   const defaultLocale = siteConfig?.defaultLanguage || "en";
@@ -736,11 +749,14 @@ async function loadSiteLocales(config, options) {
       { ...options, public: true, retry: options?.retry ?? "build" },
       "site config"
     );
-    value = localesFromSiteConfig(data.public?.siteConfig ?? null);
+    const siteConfig = data.public?.siteConfig ?? null;
+    if (siteConfig?.workspaceId)
+      primeWorkspaceId(config, siteConfig.workspaceId);
+    value = localesFromSiteConfig(siteConfig);
   } catch {
     value = null;
   }
-  if (cache.size >= MAX_ENTRIES) cache.clear();
+  if (cache.size >= MAX_ENTRIES2) cache.clear();
   cache.set(key, {
     value,
     expires: Date.now() + (value ? TTL_MS : FAILURE_TTL_MS)

package/dist/index.js

@@ -464,6 +464,26 @@ async function resolveWorkspaceId(config, options = {}) {
   }
   return siteConfig.workspaceId;
 }
+var MAX_ENTRIES = 64;
+var workspaceIdCache = /* @__PURE__ */ new Map();
+function cacheKey(config) {
+  return `${resolveApiUrl(config.apiUrl)}::${config.org}::${config.workspaceSlug}`;
+}
+function cachedWorkspaceId(config, options = {}) {
+  const key = cacheKey(config);
+  const existing = workspaceIdCache.get(key);
+  if (existing) return existing;
+  const fresh = resolveWorkspaceId(config, options).catch((err) => {
+    workspaceIdCache.delete(key);
+    throw err;
+  });
+  if (workspaceIdCache.size >= MAX_ENTRIES) workspaceIdCache.clear();
+  workspaceIdCache.set(key, fresh);
+  return fresh;
+}
+function primeWorkspaceId(config, workspaceId) {
+  workspaceIdCache.set(cacheKey(config), Promise.resolve(workspaceId));
+}
 
 // src/data/client.ts
 function createCmssyClient(input) {
@@ -471,19 +491,8 @@ function createCmssyClient(input) {
     ...input,
     apiUrl: resolveApiUrl(input.apiUrl)
   };
-  let cachedWorkspaceId;
-  let inFlight;
   function resolveWorkspaceId2(options) {
-    if (cachedWorkspaceId) return Promise.resolve(cachedWorkspaceId);
-    if (!inFlight) {
-      inFlight = resolveWorkspaceId(config, options).then((id) => {
-        cachedWorkspaceId = id;
-        return id;
-      }).finally(() => {
-        inFlight = void 0;
-      });
-    }
-    return inFlight;
+    return cachedWorkspaceId(config, options);
   }
   function query(document2, variables, options) {
     return graphqlRequest(
@@ -514,7 +523,11 @@ function createCmssyClient(input) {
   const client = {
     config,
     resolveWorkspaceId: resolveWorkspaceId2,
-    query: ((document2, variables = {}, options) => query(documentText(document2), variables, options)),
+    query: ((document2, variables = {}, options) => query(
+      documentText(document2),
+      variables,
+      options
+    )),
     queryScoped: ((document2, variables = {}, options = {}) => queryScoped(
       documentText(document2),
       variables,
@@ -711,7 +724,7 @@ function localizeHref(href, locale) {
 // src/data/site-locales.ts
 var TTL_MS = 6e4;
 var FAILURE_TTL_MS = 5e3;
-var MAX_ENTRIES = 64;
+var MAX_ENTRIES2 = 64;
 var cache = /* @__PURE__ */ new Map();
 function localesFromSiteConfig(siteConfig) {
   const defaultLocale = siteConfig?.defaultLanguage || "en";
@@ -735,11 +748,14 @@ async function loadSiteLocales(config, options) {
       { ...options, public: true, retry: options?.retry ?? "build" },
       "site config"
     );
-    value = localesFromSiteConfig(data.public?.siteConfig ?? null);
+    const siteConfig = data.public?.siteConfig ?? null;
+    if (siteConfig?.workspaceId)
+      primeWorkspaceId(config, siteConfig.workspaceId);
+    value = localesFromSiteConfig(siteConfig);
   } catch {
     value = null;
   }
-  if (cache.size >= MAX_ENTRIES) cache.clear();
+  if (cache.size >= MAX_ENTRIES2) cache.clear();
   cache.set(key, {
     value,
     expires: Date.now() + (value ? TTL_MS : FAILURE_TTL_MS)

package/dist/internal/locale.cjs

@@ -224,6 +224,15 @@ var SITE_CONFIG_QUERY = `query PublicSiteConfig($workspaceSlug: String!) {
   }
 }`;
 
+// src/data/settings-client.ts
+var workspaceIdCache = /* @__PURE__ */ new Map();
+function cacheKey(config) {
+  return `${resolveApiUrl(config.apiUrl)}::${config.org}::${config.workspaceSlug}`;
+}
+function primeWorkspaceId(config, workspaceId) {
+  workspaceIdCache.set(cacheKey(config), Promise.resolve(workspaceId));
+}
+
 // src/data/site-locales.ts
 var TTL_MS = 6e4;
 var FAILURE_TTL_MS = 5e3;
@@ -251,7 +260,10 @@ async function loadSiteLocales(config, options) {
       { ...options, public: true, retry: options?.retry ?? "build" },
       "site config"
     );
-    value = localesFromSiteConfig(data.public?.siteConfig ?? null);
+    const siteConfig = data.public?.siteConfig ?? null;
+    if (siteConfig?.workspaceId)
+      primeWorkspaceId(config, siteConfig.workspaceId);
+    value = localesFromSiteConfig(siteConfig);
   } catch {
     value = null;
   }

package/dist/internal/locale.js

@@ -222,6 +222,15 @@ var SITE_CONFIG_QUERY = `query PublicSiteConfig($workspaceSlug: String!) {
   }
 }`;
 
+// src/data/settings-client.ts
+var workspaceIdCache = /* @__PURE__ */ new Map();
+function cacheKey(config) {
+  return `${resolveApiUrl(config.apiUrl)}::${config.org}::${config.workspaceSlug}`;
+}
+function primeWorkspaceId(config, workspaceId) {
+  workspaceIdCache.set(cacheKey(config), Promise.resolve(workspaceId));
+}
+
 // src/data/site-locales.ts
 var TTL_MS = 6e4;
 var FAILURE_TTL_MS = 5e3;
@@ -249,7 +258,10 @@ async function loadSiteLocales(config, options) {
       { ...options, public: true, retry: options?.retry ?? "build" },
       "site config"
     );
-    value = localesFromSiteConfig(data.public?.siteConfig ?? null);
+    const siteConfig = data.public?.siteConfig ?? null;
+    if (siteConfig?.workspaceId)
+      primeWorkspaceId(config, siteConfig.workspaceId);
+    value = localesFromSiteConfig(siteConfig);
   } catch {
     value = null;
   }

package/dist/internal.cjs

@@ -514,7 +514,26 @@ async function resolveWorkspaceId(config, options = {}) {
   }
   return siteConfig.workspaceId;
 }
+var MAX_ENTRIES = 64;
 var workspaceIdCache = /* @__PURE__ */ new Map();
+function cacheKey(config) {
+  return `${resolveApiUrl(config.apiUrl)}::${config.org}::${config.workspaceSlug}`;
+}
+function cachedWorkspaceId(config, options = {}) {
+  const key = cacheKey(config);
+  const existing = workspaceIdCache.get(key);
+  if (existing) return existing;
+  const fresh = resolveWorkspaceId(config, options).catch((err) => {
+    workspaceIdCache.delete(key);
+    throw err;
+  });
+  if (workspaceIdCache.size >= MAX_ENTRIES) workspaceIdCache.clear();
+  workspaceIdCache.set(key, fresh);
+  return fresh;
+}
+function primeWorkspaceId(config, workspaceId) {
+  workspaceIdCache.set(cacheKey(config), Promise.resolve(workspaceId));
+}
 function clearWorkspaceIdCache() {
   workspaceIdCache.clear();
 }
@@ -673,19 +692,8 @@ function createCmssyClient(input) {
     ...input,
     apiUrl: resolveApiUrl(input.apiUrl)
   };
-  let cachedWorkspaceId;
-  let inFlight;
   function resolveWorkspaceId2(options) {
-    if (cachedWorkspaceId) return Promise.resolve(cachedWorkspaceId);
-    if (!inFlight) {
-      inFlight = resolveWorkspaceId(config, options).then((id) => {
-        cachedWorkspaceId = id;
-        return id;
-      }).finally(() => {
-        inFlight = void 0;
-      });
-    }
-    return inFlight;
+    return cachedWorkspaceId(config, options);
   }
   function query(document2, variables, options) {
     return graphqlRequest(
@@ -716,7 +724,11 @@ function createCmssyClient(input) {
   const client = {
     config,
     resolveWorkspaceId: resolveWorkspaceId2,
-    query: ((document2, variables = {}, options) => query(documentText(document2), variables, options)),
+    query: ((document2, variables = {}, options) => query(
+      documentText(document2),
+      variables,
+      options
+    )),
     queryScoped: ((document2, variables = {}, options = {}) => queryScoped(
       documentText(document2),
       variables,
@@ -1017,7 +1029,7 @@ async function resolveForms(config, blocks, schemas, locale, defaultLocale, opti
 // src/data/site-locales.ts
 var TTL_MS = 6e4;
 var FAILURE_TTL_MS = 5e3;
-var MAX_ENTRIES = 64;
+var MAX_ENTRIES2 = 64;
 var cache = /* @__PURE__ */ new Map();
 function localesFromSiteConfig(siteConfig) {
   const defaultLocale = siteConfig?.defaultLanguage || "en";
@@ -1041,11 +1053,14 @@ async function loadSiteLocales(config, options) {
       { ...options, public: true, retry: options?.retry ?? "build" },
       "site config"
     );
-    value = localesFromSiteConfig(data.public?.siteConfig ?? null);
+    const siteConfig = data.public?.siteConfig ?? null;
+    if (siteConfig?.workspaceId)
+      primeWorkspaceId(config, siteConfig.workspaceId);
+    value = localesFromSiteConfig(siteConfig);
   } catch {
     value = null;
   }
-  if (cache.size >= MAX_ENTRIES) cache.clear();
+  if (cache.size >= MAX_ENTRIES2) cache.clear();
   cache.set(key, {
     value,
     expires: Date.now() + (value ? TTL_MS : FAILURE_TTL_MS)

package/dist/internal.js

@@ -512,7 +512,26 @@ async function resolveWorkspaceId(config, options = {}) {
   }
   return siteConfig.workspaceId;
 }
+var MAX_ENTRIES = 64;
 var workspaceIdCache = /* @__PURE__ */ new Map();
+function cacheKey(config) {
+  return `${resolveApiUrl(config.apiUrl)}::${config.org}::${config.workspaceSlug}`;
+}
+function cachedWorkspaceId(config, options = {}) {
+  const key = cacheKey(config);
+  const existing = workspaceIdCache.get(key);
+  if (existing) return existing;
+  const fresh = resolveWorkspaceId(config, options).catch((err) => {
+    workspaceIdCache.delete(key);
+    throw err;
+  });
+  if (workspaceIdCache.size >= MAX_ENTRIES) workspaceIdCache.clear();
+  workspaceIdCache.set(key, fresh);
+  return fresh;
+}
+function primeWorkspaceId(config, workspaceId) {
+  workspaceIdCache.set(cacheKey(config), Promise.resolve(workspaceId));
+}
 function clearWorkspaceIdCache() {
   workspaceIdCache.clear();
 }
@@ -671,19 +690,8 @@ function createCmssyClient(input) {
     ...input,
     apiUrl: resolveApiUrl(input.apiUrl)
   };
-  let cachedWorkspaceId;
-  let inFlight;
   function resolveWorkspaceId2(options) {
-    if (cachedWorkspaceId) return Promise.resolve(cachedWorkspaceId);
-    if (!inFlight) {
-      inFlight = resolveWorkspaceId(config, options).then((id) => {
-        cachedWorkspaceId = id;
-        return id;
-      }).finally(() => {
-        inFlight = void 0;
-      });
-    }
-    return inFlight;
+    return cachedWorkspaceId(config, options);
   }
   function query(document2, variables, options) {
     return graphqlRequest(
@@ -714,7 +722,11 @@ function createCmssyClient(input) {
   const client = {
     config,
     resolveWorkspaceId: resolveWorkspaceId2,
-    query: ((document2, variables = {}, options) => query(documentText(document2), variables, options)),
+    query: ((document2, variables = {}, options) => query(
+      documentText(document2),
+      variables,
+      options
+    )),
     queryScoped: ((document2, variables = {}, options = {}) => queryScoped(
       documentText(document2),
       variables,
@@ -1015,7 +1027,7 @@ async function resolveForms(config, blocks, schemas, locale, defaultLocale, opti
 // src/data/site-locales.ts
 var TTL_MS = 6e4;
 var FAILURE_TTL_MS = 5e3;
-var MAX_ENTRIES = 64;
+var MAX_ENTRIES2 = 64;
 var cache = /* @__PURE__ */ new Map();
 function localesFromSiteConfig(siteConfig) {
   const defaultLocale = siteConfig?.defaultLanguage || "en";
@@ -1039,11 +1051,14 @@ async function loadSiteLocales(config, options) {
       { ...options, public: true, retry: options?.retry ?? "build" },
       "site config"
     );
-    value = localesFromSiteConfig(data.public?.siteConfig ?? null);
+    const siteConfig = data.public?.siteConfig ?? null;
+    if (siteConfig?.workspaceId)
+      primeWorkspaceId(config, siteConfig.workspaceId);
+    value = localesFromSiteConfig(siteConfig);
   } catch {
     value = null;
   }
-  if (cache.size >= MAX_ENTRIES) cache.clear();
+  if (cache.size >= MAX_ENTRIES2) cache.clear();
   cache.set(key, {
     value,
     expires: Date.now() + (value ? TTL_MS : FAILURE_TTL_MS)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/core",
-  "version": "16.1.1",
+  "version": "16.2.1",
   "description": "Framework-agnostic cmssy gateway: GraphQL client, block/field system, editor protocol. No React, no Next.",
   "keywords": [
     "cmssy",
@@ -87,7 +87,7 @@
     "vitest": "^2.1.0"
   },
   "dependencies": {
-    "@cmssy/types": "0.41.0",
+    "@cmssy/types": "0.43.0",
     "jose": "^6.2.3"
   },
   "scripts": {