@symbo.ls/utils 3.14.276 → 3.14.446

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @symbo.ls/utils
 
+## 3.14.446
+
+### Patch Changes
+
+- Auto-generated cross-repo patch release.
+
 ## 3.14.276
 
 ### Patch Changes

package/dist/cjs/sharedLibraries.js

@@ -1 +1 @@
-"use strict";var u=Object.defineProperty;var L=Object.getOwnPropertyDescriptor;var U=Object.getOwnPropertyNames;var $=Object.prototype.hasOwnProperty;var R=(e,n)=>{for(var o in n)u(e,o,{get:n[o],enumerable:!0})},j=(e,n,o,t)=>{if(n&&typeof n=="object"||typeof n=="function")for(let r of U(n))!$.call(e,r)&&r!==o&&u(e,r,{get:()=>n[r],enumerable:!(t=L(n,r))||t.enumerable});return e};var A=e=>j(u({},"__esModule",{value:!0}),e);var g={};R(g,{deepDefaults:()=>f,fetchLibraryData:()=>p,mergeSharedLibraries:()=>E,normalizeLibraryKey:()=>c,resolveSharedLibraries:()=>I});module.exports=A(g);var i=require("./types.js");const h="system",S="https://smbls-kv.nika-980.workers.dev",_="https://api.symbols.app";function c(e){const n=String(e||"").trim();if(!n)return{owner:h,key:"",full:""};let o=null,t=n;if(n.includes("/")){const s=n.indexOf("/");o=n.slice(0,s),t=n.slice(s+1)}t=t.replace(/\.symbo\.ls$/iu,""),o||(o=h);const r=t?`${o}/${t}`:"";return{owner:o,key:t,full:r}}const f=(e,n)=>{for(const o in n)o in e?(0,i.isObject)(e[o])&&(0,i.isObject)(n[o])&&f(e[o],n[o]):e[o]=n[o]},E=(e,n)=>{if(!(!n||!n.length))for(let o=0;o<n.length;o++){const t=n[o];if((0,i.isObject)(t)){for(const r in t)if(Object.prototype.hasOwnProperty.call(t,r))if((0,i.isObject)(t[r])&&(0,i.isObject)(e[r]))if(r==="designSystem")f(e[r],t[r]);else for(const s in t[r])s in e[r]||(e[r][s]=t[r][s]);else r in e||(e[r]=t[r])}}};async function p(e,n={}){if((n.provider||"kv")==="api")return y(e,n);const t=await B(e,n);return t||y(e,n)}async function B(e,n={}){const o=n.kvBaseUrl||S,t=n.env||"production",r=`${o}/kv/${encodeURIComponent(e)}?env=${t}`;try{const s=await fetch(r,{method:"GET"});return s.ok&&(await s.json())?.value||null}catch{return null}}async function y(e,n={}){const o=n.apiBaseUrl||_,{key:t}=c(e);try{const r=`${o}/core/projects/libraries/available?search=${encodeURIComponent(t)}&limit=10`,s=await fetch(r,{method:"GET"});if(!s.ok)return null;const a=await s.json(),l=(a?.items||a?.data||(Array.isArray(a)?a:[])).find(v=>{const{key:w}=c(v?.key);return w.toLowerCase()===t.toLowerCase()});if(!l?.id&&!l?._id)return null;const b=l.id||l._id,k=`${o}/core/projects/${encodeURIComponent(b)}/data?branch=main`,d=await fetch(k,{method:"GET"});if(!d.ok)return null;const m=await d.json();return m?.data||m||null}catch{return null}}async function I(e,n={}){return!e||!e.length?[]:(await Promise.all(e.map(async t=>{if((0,i.isObject)(t))return t;if((0,i.isString)(t)){const{full:r}=c(t);if(!r)return null;try{const s=await p(r,n);return s||console.warn(`[smbls] Shared library "${r}" not found`),s}catch(s){return console.warn(`[smbls] Failed to fetch shared library "${r}":`,s.message),null}}return null}))).filter(Boolean)}
+"use strict";var u=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var U=Object.getOwnPropertyNames;var j=Object.prototype.hasOwnProperty;var g=(n,t)=>{for(var e in t)u(n,e,{get:t[e],enumerable:!0})},E=(n,t,e,r)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of U(t))!j.call(n,i)&&i!==e&&u(n,i,{get:()=>t[i],enumerable:!(r=R(t,i))||r.enumerable});return n};var S=n=>E(u({},"__esModule",{value:!0}),n);var P={};g(P,{deepDefaults:()=>f,fetchLibraryData:()=>k,isWrappedLibrary:()=>d,mergeSharedLibraries:()=>F,normalizeIgnoreList:()=>w,normalizeLibraryKey:()=>c,resolveSharedLibraries:()=>K,sharedLibrary:()=>x});module.exports=S(P);var s=require("./types.js");const m="system",_="https://smbls-kv.nika-980.workers.dev",I="https://api.symbols.app";function c(n){const t=String(n||"").trim();if(!t)return{owner:m,key:"",full:""};let e=null,r=t;if(t.includes("/")){const o=t.indexOf("/");e=t.slice(0,o),r=t.slice(o+1)}r=r.replace(/\.symbo\.ls$/iu,""),e||(e=m);const i=r?`${e}/${r}`:"";return{owner:e,key:r,full:i}}const f=(n,t,e,r)=>{for(const i in t){const o=r?`${r}/${i}`:i;e&&e.has(o)||(i in n?(0,s.isObject)(n[i])&&(0,s.isObject)(t[i])&&f(n[i],t[i],e,o):n[i]=t[i])}},O=new Set,B=n=>n.replace(/\.js$/iu,""),w=n=>{const t=new Set;if(!Array.isArray(n))return t;for(const e of n){if(!(0,s.isString)(e))continue;const r=e.split("/").map(i=>B(i.trim())).filter(Boolean).join("/");r&&t.add(r)}return t},x=(n,t={})=>({library:n,ignoreList:Array.isArray(t.ignoreList)?t.ignoreList:[]}),d=n=>(0,s.isObject)(n)&&Array.isArray(n.ignoreList)&&("library"in n||"key"in n||"name"in n),C=n=>n.library!==void 0?n.library:n.key??n.name,T=(n,t,e)=>{for(const r in t)if(Object.prototype.hasOwnProperty.call(t,r)&&!e.has(r))if((0,s.isObject)(t[r])&&(0,s.isObject)(n[r]))if(r==="designSystem")f(n[r],t[r],e,r);else for(const i in t[r])e.has(`${r}/${i}`)||i in n[r]||(n[r][i]=t[r][i]);else r in n||(n[r]=t[r])},F=(n,t)=>{if(!(!t||!t.length))for(let e=0;e<t.length;e++){let r=t[e],i=O;d(r)&&(i=w(r.ignoreList),r=r.library),(0,s.isObject)(r)&&T(n,r,i)}};async function k(n,t={}){if((t.provider||"kv")==="api")return h(n,t);const r=await G(n,t);return r||h(n,t)}async function G(n,t={}){const e=t.kvBaseUrl||_,r=t.env||"production",i=`${e}/kv/${encodeURIComponent(n)}?env=${r}`;try{const o=await fetch(i,{method:"GET"});return o.ok&&(await o.json())?.value||null}catch{return null}}async function h(n,t={}){const e=t.apiBaseUrl||I,{key:r}=c(n);try{const i=`${e}/core/projects/libraries/available?search=${encodeURIComponent(r)}&limit=10`,o=await fetch(i,{method:"GET"});if(!o.ok)return null;const a=await o.json(),l=(a?.items||a?.data||(Array.isArray(a)?a:[])).find($=>{const{key:A}=c($?.key);return A.toLowerCase()===r.toLowerCase()});if(!l?.id&&!l?._id)return null;const L=l.id||l._id,v=`${e}/core/projects/${encodeURIComponent(L)}/data?branch=main`,y=await fetch(v,{method:"GET"});if(!y.ok)return null;const p=await y.json();return p?.data||p||null}catch{return null}}async function b(n,t={}){if((0,s.isObject)(n))return n;if((0,s.isString)(n)){const{full:e}=c(n);if(!e)return null;try{const r=await k(e,t);return r||console.warn(`[smbls] Shared library "${e}" not found`),r}catch(r){return console.warn(`[smbls] Failed to fetch shared library "${e}":`,r.message),null}}return null}async function K(n,t={}){return!n||!n.length?[]:(await Promise.all(n.map(async r=>{if(d(r)){const i=await b(C(r),t);return i?{library:i,ignoreList:r.ignoreList}:null}return b(r,t)}))).filter(Boolean)}

package/dist/esm/sharedLibraries.js

@@ -1 +1 @@
-import{isObject as i,isString as v}from"./types.js";const d="system",w="https://smbls-kv.nika-980.workers.dev",L="https://api.symbols.app";function c(t){const n=String(t||"").trim();if(!n)return{owner:d,key:"",full:""};let r=null,e=n;if(n.includes("/")){const s=n.indexOf("/");r=n.slice(0,s),e=n.slice(s+1)}e=e.replace(/\.symbo\.ls$/iu,""),r||(r=d);const o=e?`${r}/${e}`:"";return{owner:r,key:e,full:o}}const m=(t,n)=>{for(const r in n)r in t?i(t[r])&&i(n[r])&&m(t[r],n[r]):t[r]=n[r]},A=(t,n)=>{if(!(!n||!n.length))for(let r=0;r<n.length;r++){const e=n[r];if(i(e)){for(const o in e)if(Object.prototype.hasOwnProperty.call(e,o))if(i(e[o])&&i(t[o]))if(o==="designSystem")m(t[o],e[o]);else for(const s in e[o])s in t[o]||(t[o][s]=e[o][s]);else o in t||(t[o]=e[o])}}};async function U(t,n={}){if((n.provider||"kv")==="api")return h(t,n);const e=await $(t,n);return e||h(t,n)}async function $(t,n={}){const r=n.kvBaseUrl||w,e=n.env||"production",o=`${r}/kv/${encodeURIComponent(t)}?env=${e}`;try{const s=await fetch(o,{method:"GET"});return s.ok&&(await s.json())?.value||null}catch{return null}}async function h(t,n={}){const r=n.apiBaseUrl||L,{key:e}=c(t);try{const o=`${r}/core/projects/libraries/available?search=${encodeURIComponent(e)}&limit=10`,s=await fetch(o,{method:"GET"});if(!s.ok)return null;const a=await s.json(),l=(a?.items||a?.data||(Array.isArray(a)?a:[])).find(b=>{const{key:k}=c(b?.key);return k.toLowerCase()===e.toLowerCase()});if(!l?.id&&!l?._id)return null;const y=l.id||l._id,p=`${r}/core/projects/${encodeURIComponent(y)}/data?branch=main`,u=await fetch(p,{method:"GET"});if(!u.ok)return null;const f=await u.json();return f?.data||f||null}catch{return null}}async function S(t,n={}){return!t||!t.length?[]:(await Promise.all(t.map(async e=>{if(i(e))return e;if(v(e)){const{full:o}=c(e);if(!o)return null;try{const s=await U(o,n);return s||console.warn(`[smbls] Shared library "${o}" not found`),s}catch(s){return console.warn(`[smbls] Failed to fetch shared library "${o}":`,s.message),null}}return null}))).filter(Boolean)}export{m as deepDefaults,U as fetchLibraryData,A as mergeSharedLibraries,c as normalizeLibraryKey,S as resolveSharedLibraries};
+import{isObject as s,isString as d}from"./types.js";const y="system",$="https://smbls-kv.nika-980.workers.dev",A="https://api.symbols.app";function c(r){const t=String(r||"").trim();if(!t)return{owner:y,key:"",full:""};let e=null,n=t;if(t.includes("/")){const o=t.indexOf("/");e=t.slice(0,o),n=t.slice(o+1)}n=n.replace(/\.symbo\.ls$/iu,""),e||(e=y);const i=n?`${e}/${n}`:"";return{owner:e,key:n,full:i}}const p=(r,t,e,n)=>{for(const i in t){const o=n?`${n}/${i}`:i;e&&e.has(o)||(i in r?s(r[i])&&s(t[i])&&p(r[i],t[i],e,o):r[i]=t[i])}},R=new Set,U=r=>r.replace(/\.js$/iu,""),j=r=>{const t=new Set;if(!Array.isArray(r))return t;for(const e of r){if(!d(e))continue;const n=e.split("/").map(i=>U(i.trim())).filter(Boolean).join("/");n&&t.add(n)}return t},B=(r,t={})=>({library:r,ignoreList:Array.isArray(t.ignoreList)?t.ignoreList:[]}),m=r=>s(r)&&Array.isArray(r.ignoreList)&&("library"in r||"key"in r||"name"in r),g=r=>r.library!==void 0?r.library:r.key??r.name,E=(r,t,e)=>{for(const n in t)if(Object.prototype.hasOwnProperty.call(t,n)&&!e.has(n))if(s(t[n])&&s(r[n]))if(n==="designSystem")p(r[n],t[n],e,n);else for(const i in t[n])e.has(`${n}/${i}`)||i in r[n]||(r[n][i]=t[n][i]);else n in r||(r[n]=t[n])},x=(r,t)=>{if(!(!t||!t.length))for(let e=0;e<t.length;e++){let n=t[e],i=R;m(n)&&(i=j(n.ignoreList),n=n.library),s(n)&&E(r,n,i)}};async function S(r,t={}){if((t.provider||"kv")==="api")return h(r,t);const n=await _(r,t);return n||h(r,t)}async function _(r,t={}){const e=t.kvBaseUrl||$,n=t.env||"production",i=`${e}/kv/${encodeURIComponent(r)}?env=${n}`;try{const o=await fetch(i,{method:"GET"});return o.ok&&(await o.json())?.value||null}catch{return null}}async function h(r,t={}){const e=t.apiBaseUrl||A,{key:n}=c(r);try{const i=`${e}/core/projects/libraries/available?search=${encodeURIComponent(n)}&limit=10`,o=await fetch(i,{method:"GET"});if(!o.ok)return null;const a=await o.json(),l=(a?.items||a?.data||(Array.isArray(a)?a:[])).find(L=>{const{key:v}=c(L?.key);return v.toLowerCase()===n.toLowerCase()});if(!l?.id&&!l?._id)return null;const w=l.id||l._id,k=`${e}/core/projects/${encodeURIComponent(w)}/data?branch=main`,u=await fetch(k,{method:"GET"});if(!u.ok)return null;const f=await u.json();return f?.data||f||null}catch{return null}}async function b(r,t={}){if(s(r))return r;if(d(r)){const{full:e}=c(r);if(!e)return null;try{const n=await S(e,t);return n||console.warn(`[smbls] Shared library "${e}" not found`),n}catch(n){return console.warn(`[smbls] Failed to fetch shared library "${e}":`,n.message),null}}return null}async function C(r,t={}){return!r||!r.length?[]:(await Promise.all(r.map(async n=>{if(m(n)){const i=await b(g(n),t);return i?{library:i,ignoreList:n.ignoreList}:null}return b(n,t)}))).filter(Boolean)}export{p as deepDefaults,S as fetchLibraryData,m as isWrappedLibrary,x as mergeSharedLibraries,j as normalizeIgnoreList,c as normalizeLibraryKey,C as resolveSharedLibraries,B as sharedLibrary};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/utils",
-  "version": "3.14.276",
+  "version": "3.14.446",
   "license": "CC-BY-NC-4.0",
   "type": "module",
   "module": "./dist/esm/index.js",

package/sharedLibraries.js

@@ -42,13 +42,101 @@ export function normalizeLibraryKey (raw) {
 /**
  * Recursively set defaults: copy keys from source into target
  * only where target is missing them. Non-destructive.
+ *
+ * @param {object} target
+ * @param {object} source
+ * @param {Set<string>} [ignore] - normalized '/'-joined paths to skip
+ * @param {string} [prefix] - current path prefix used to match `ignore`
  */
-export const deepDefaults = (target, source) => {
+export const deepDefaults = (target, source, ignore, prefix) => {
   for (const k in source) {
+    const path = prefix ? `${prefix}/${k}` : k
+    if (ignore && ignore.has(path)) continue
     if (!(k in target)) {
       target[k] = source[k]
     } else if (isObject(target[k]) && isObject(source[k])) {
-      deepDefaults(target[k], source[k])
+      deepDefaults(target[k], source[k], ignore, path)
+    }
+  }
+}
+
+const EMPTY_IGNORE = new Set()
+
+const stripJsExt = (segment) => segment.replace(/\.js$/iu, '')
+
+/**
+ * Normalize an `ignoreList` into a Set of '/'-joined path strings.
+ *
+ * Each entry names something to skip while merging a shared library — a
+ * top-level context key ('designSystem', 'state'), a file-ish top-level key
+ * ('app.js' → 'app'), or a nested path ('components/Header', 'designSystem/
+ * icons'). A trailing `.js` on any path segment is stripped, so file names and
+ * context keys are interchangeable.
+ *
+ *   ['designSystem', 'app.js', 'components/Header']
+ *     → Set { 'designSystem', 'app', 'components/Header' }
+ */
+export const normalizeIgnoreList = (ignoreList) => {
+  const set = new Set()
+  if (!Array.isArray(ignoreList)) return set
+  for (const entry of ignoreList) {
+    if (!isString(entry)) continue
+    const path = entry
+      .split('/')
+      .map((seg) => stripJsExt(seg.trim()))
+      .filter(Boolean)
+      .join('/')
+    if (path) set.add(path)
+  }
+  return set
+}
+
+/**
+ * Wrap a shared library with merge options. Pass the result anywhere a
+ * shared-library entry is accepted (the `sharedLibraries` array); it is
+ * unwrapped during merge and its options honored.
+ *
+ *   sharedLibrary(bigbrother, { ignoreList: ['designSystem', 'app.js'] })
+ *
+ * @param {object|string} library - a library context object or identifier
+ * @param {object} [options]
+ * @param {string[]} [options.ignoreList] - paths to skip while merging
+ */
+export const sharedLibrary = (library, options = {}) => ({
+  library,
+  ignoreList: Array.isArray(options.ignoreList) ? options.ignoreList : []
+})
+
+// A wrapped entry carries an `ignoreList` array alongside the library it
+// applies to. The library is named by `library` (a context object or an
+// identifier string) OR, for symbols.json-shaped configs, by `key`/`name`.
+// The `ignoreList` array is the discriminator — a bare library context never
+// has one — so this never misfires on a real context.
+export const isWrappedLibrary = (entry) =>
+  isObject(entry) &&
+  Array.isArray(entry.ignoreList) &&
+  ('library' in entry || 'key' in entry || 'name' in entry)
+
+// The library a wrapped entry points at: an explicit `library`, else the
+// symbols.json identifier fields `key`/`name`.
+const wrappedLibraryRef = (entry) =>
+  entry.library !== undefined ? entry.library : (entry.key ?? entry.name)
+
+const mergeOneLibrary = (context, sharedLib, ignore) => {
+  for (const key in sharedLib) {
+    if (!Object.prototype.hasOwnProperty.call(sharedLib, key)) continue
+    if (ignore.has(key)) continue // top-level skip: 'designSystem', 'app', 'state'
+    if (isObject(sharedLib[key]) && isObject(context[key])) {
+      if (key === 'designSystem') {
+        deepDefaults(context[key], sharedLib[key], ignore, key)
+      } else {
+        for (const k in sharedLib[key]) {
+          if (ignore.has(`${key}/${k}`)) continue // nested skip: 'components/Header'
+          if (!(k in context[key])) context[key][k] = sharedLib[key][k]
+        }
+      }
+    } else if (!(key in context)) {
+      context[key] = sharedLib[key]
     }
   }
 }
@@ -58,26 +146,22 @@ export const deepDefaults = (target, source) => {
  * - designSystem: deep defaults (non-destructive recursive)
  * - other object keys (components, pages, etc.): shallow add missing
  * - new top-level keys: copy from library
+ *
+ * Entries may be a bare library context, or a wrapped `{ library, ignoreList }`
+ * (see `sharedLibrary`). `ignoreList` names paths to skip while merging that
+ * library — e.g. `['designSystem']` imports a library WITHOUT its design system.
  */
 export const mergeSharedLibraries = (context, libraries) => {
   if (!libraries || !libraries.length) return
   for (let i = 0; i < libraries.length; i++) {
-    const sharedLib = libraries[i]
-    if (!isObject(sharedLib)) continue
-    for (const key in sharedLib) {
-      if (!Object.prototype.hasOwnProperty.call(sharedLib, key)) continue
-      if (isObject(sharedLib[key]) && isObject(context[key])) {
-        if (key === 'designSystem') {
-          deepDefaults(context[key], sharedLib[key])
-        } else {
-          for (const k in sharedLib[key]) {
-            if (!(k in context[key])) context[key][k] = sharedLib[key][k]
-          }
-        }
-      } else if (!(key in context)) {
-        context[key] = sharedLib[key]
-      }
+    let sharedLib = libraries[i]
+    let ignore = EMPTY_IGNORE
+    if (isWrappedLibrary(sharedLib)) {
+      ignore = normalizeIgnoreList(sharedLib.ignoreList)
+      sharedLib = sharedLib.library
     }
+    if (!isObject(sharedLib)) continue
+    mergeOneLibrary(context, sharedLib, ignore)
   }
 }
 
@@ -149,11 +233,36 @@ async function fetchLibraryFromApi (identifier, opts = {}) {
   }
 }
 
+// Resolve a single entry: a context object passes through; an identifier
+// string is fetched into a library object.
+async function resolveOneLibrary (entry, opts = {}) {
+  if (isObject(entry)) return entry
+  if (isString(entry)) {
+    const { full } = normalizeLibraryKey(entry)
+    if (!full) return null
+    try {
+      const data = await fetchLibraryData(full, opts)
+      if (!data) {
+        console.warn(`[smbls] Shared library "${full}" not found`)
+      }
+      return data
+    } catch (e) {
+      console.warn(`[smbls] Failed to fetch shared library "${full}":`, e.message)
+      return null
+    }
+  }
+  return null
+}
+
 /**
  * Resolve an array that may contain strings and/or objects.
  * Strings are treated as library identifiers and fetched.
  * Objects pass through unchanged.
  *
+ * Wrapped entries (`{ library, ignoreList }` from `sharedLibrary`) are
+ * preserved: the inner `library` is resolved (so it may itself be an
+ * identifier string) while `ignoreList` is carried through to the merge step.
+ *
  * @param {Array<string|object>} libraries - Mixed array
  * @param {object} [opts] - Options passed to fetchLibraryData
  * @returns {Promise<object[]>} Array of resolved library objects
@@ -162,22 +271,12 @@ export async function resolveSharedLibraries (libraries, opts = {}) {
   if (!libraries || !libraries.length) return []
   const resolved = await Promise.all(
     libraries.map(async (entry) => {
-      if (isObject(entry)) return entry
-      if (isString(entry)) {
-        const { full } = normalizeLibraryKey(entry)
-        if (!full) return null
-        try {
-          const data = await fetchLibraryData(full, opts)
-          if (!data) {
-            console.warn(`[smbls] Shared library "${full}" not found`)
-          }
-          return data
-        } catch (e) {
-          console.warn(`[smbls] Failed to fetch shared library "${full}":`, e.message)
-          return null
-        }
+      if (isWrappedLibrary(entry)) {
+        const library = await resolveOneLibrary(wrappedLibraryRef(entry), opts)
+        if (!library) return null
+        return { library, ignoreList: entry.ignoreList }
       }
-      return null
+      return resolveOneLibrary(entry, opts)
     })
   )
   return resolved.filter(Boolean)