@webority/tokens 0.156.0 → 0.158.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,7 +2,7 @@
2
2
  "format": "webority-theme-tokens/2",
3
3
  "source": {
4
4
  "package": "@webority/tokens",
5
- "version": "0.156.0",
5
+ "version": "0.158.0",
6
6
  "brand": null,
7
7
  "platform": "phone",
8
8
  "width": null
@@ -2,7 +2,7 @@
2
2
  "format": "webority-theme-tokens/2",
3
3
  "source": {
4
4
  "package": "@webority/tokens",
5
- "version": "0.156.0",
5
+ "version": "0.158.0",
6
6
  "brand": null,
7
7
  "platform": "web",
8
8
  "width": 390
@@ -2,7 +2,7 @@
2
2
  "format": "webority-theme-tokens/2",
3
3
  "source": {
4
4
  "package": "@webority/tokens",
5
- "version": "0.156.0",
5
+ "version": "0.158.0",
6
6
  "brand": null,
7
7
  "platform": "web",
8
8
  "width": 1440
@@ -2,7 +2,7 @@
2
2
  "format": "webority-meanings/1",
3
3
  "source": {
4
4
  "package": "@webority/tokens",
5
- "version": "0.156.0"
5
+ "version": "0.158.0"
6
6
  },
7
7
  "color": {
8
8
  "bg": {
@@ -0,0 +1,19 @@
1
+ import type { CsharpEnumArgumentRule } from "../../renames/renames.d.ts";
2
+ export type CsharpEnumHit = {
3
+ line: number;
4
+ from: string;
5
+ to: string;
6
+ };
7
+ export type CsharpEnumFinding = {
8
+ file: string;
9
+ line: number;
10
+ path: string;
11
+ message: string;
12
+ };
13
+ export type CsharpEnumResult = {
14
+ text: string;
15
+ hits: CsharpEnumHit[];
16
+ findings: CsharpEnumFinding[];
17
+ };
18
+ /** @param file repo-relative, forward slashes */
19
+ export declare function applyCsharpEnumArguments(source: string, file: string, rules: CsharpEnumArgumentRule[]): CsharpEnumResult;
@@ -0,0 +1,2 @@
1
+ import{present as e}from"../present.js";import{skipQuoted as t,skipVerbatim as n}from"./tagScan.js";import{applyEdits as r}from"./themeReads.js";var i=new Set([`.cs`,`.cshtml`]),a=/^"([^"\\]*)"$/,o=e=>{let t=/\.[^./]*$/.exec(e);return t?t[0].toLowerCase():``},s=(e,t)=>e.slice(0,t).split(`
2
+ `).length,c=e=>e.replace(/[.*+?^${}()|[\]\\]/g,`\\$&`);function l(e,t){let n=t;for(;n>0&&!`;{}`.includes(e.charAt(n-1));)n--;return e.slice(n,t).trim()}function u(e,t){let n=RegExp(`${c(t.call)}\\s*\\(`,`g`),r=[];for(let i of e.matchAll(n)){let n=i.index;/^\w/.test(t.call)&&/[\w.]/.test(e.charAt(n-1))||(t.within===void 0||l(e,n).includes(t.within))&&r.push(n+i[0].length-1)}return r}function d(e,r){let i=[],a=r+1,o=0,s=r+1;for(;s<e.length;){let r=e.charAt(s);if(r===`@`&&e.charAt(s+1)===`"`){let t=n(e,s);if(t===-1)return null;s=t}else if(r===`"`||r===`'`){let n=t(e,s,r);if(n===-1)return null;s=n}else{if(r===`(`||r===`[`||r===`{`)o++;else if(r===`)`||r===`]`||r===`}`){if(o===0)return r===`)`?(i.push({start:a,end:s}),i):null;o--}else r===`,`&&o===0&&(i.push({start:a,end:s}),a=s+1);s++}}return null}function f(t,n,c){if(c.length===0||!i.has(o(n)))return{text:t,hits:[],findings:[]};let l=[],f=[],p=[];for(let r of c){let i=`${r.call} argument ${r.argument}`,o=Object.values(r.values).join(`, `);for(let c of u(t,r)){let u=d(t,c);if(u===null){p.push({file:n,line:s(t,c),path:r.call,message:`the call could not be read (its brackets or quotes do not pair up); set it by hand`});continue}let m=u[r.argument-1];if(m===void 0)continue;let h=t.slice(m.start,m.end),g=h.trim(),_=m.start+(h.length-h.trimStart().length),v=_+g.length,y=a.exec(g);if(y===null)continue;let b=e(y[1],`the string literal`).toLowerCase(),x=Object.hasOwn(r.values,b)?r.values[b]:void 0,S=s(t,_);if(x===void 0){p.push({file:n,line:S,path:i,message:`${g} is not a ${r.enum}. Use one of: ${o}.`});continue}let C=`${r.enum}.${x}`;l.push({start:_,end:v,text:C}),f.push({line:S,from:g,to:C})}}return f.sort((e,t)=>e.line-t.line||(e.from<t.from?-1:+(e.from>t.from))),p.sort((e,t)=>e.line-t.line||(e.path<t.path?-1:+(e.path>t.path))),{text:r(t,l,n),hits:f,findings:p}}export{f as applyCsharpEnumArguments};
@@ -1,5 +1,5 @@
1
- import{brand as e}from"../build.js";import{present as t}from"../present.js";import{applyClasses as n}from"./classes.js";import{applyComponents as r}from"./components.js";import{applyCssTable as i,isCssTarget as a,ownDeclarations as o}from"./css.js";import{applyRazorAttributes as s}from"./razorAttributes.js";import{applyRazorTags as c}from"./razorTags.js";import{applyRazorValueSplits as l}from"./razorValueSplits.js";import{applyMarkup as u,applySource as d}from"./source.js";import{applyComponentProps as f,applyPropSplits as p,applyPropValues as m,applyProps as h,applyThemeReads as g}from"./themeReads.js";import{applyValueSplits as _}from"./valueSplits.js";import{applyWrapperValues as v,findWrappers as y}from"./wrapperValues.js";import{createRequire as b}from"node:module";import{existsSync as x,readFileSync as S,readdirSync as C,realpathSync as w,writeFileSync as T}from"node:fs";import{dirname as E,isAbsolute as D,join as O,relative as k,resolve as A,sep as j}from"node:path";import{fileURLToPath as M,pathToFileURL as N}from"node:url";import{spawnSync as P}from"node:child_process";var F=/^\d+\.\d+\.\d+$/,I=/^(?:workspace:|file:|link:)/,L=`WEBORITY_UPGRADE_FROM`;function R(e){if(typeof e!=`string`||!F.test(e))throw Error(`invalid version "${e}"`)}function z(e,n){R(e),R(n);let r=e.split(`.`).map(Number),i=n.split(`.`).map(Number);for(let e=0;e<3;e++)if(r[e]!==i[e])return t(r[e],`version part`)-t(i[e],`version part`);return 0}function B(){let e=E(M(import.meta.url));for(;;){let t=O(e,`package.json`);if(x(t)&&JSON.parse(S(t,`utf8`)).name===`@webority/tokens`)return e;let n=E(e);if(n===e)throw Error(`cannot find the @webority/tokens package folder`);e=n}}function V(){return JSON.parse(S(O(B(),`package.json`),`utf8`)).version}function H(e){let t=[];for(let n of C(e)){if(!n.endsWith(`.json`))continue;let r=n.slice(0,-5);F.test(r)&&t.push({version:r,table:JSON.parse(S(O(e,n),`utf8`))})}return t.sort((e,t)=>z(e.version,t.version))}function U(e,t){let n=P(`git`,[`ls-files`,`-z`,`--`,...t],{cwd:e,encoding:`utf8`,windowsHide:!0,maxBuffer:67108864});if(n.status!==0)throw Error(`not a git repository: ${e}`);let r=n.stdout.split(`\0`).filter(Boolean).map(e=>e.split(`\\`).join(`/`)).filter(t=>x(O(e,t)));return[...new Set(r)]}function W(e,t){let n=U(e,t??[`.`]);if(t!==void 0&&n.length===0)throw Error(`no tracked files under ${t.join(`, `)}`);return n}function G(e){return e.split(`/`).includes(`node_modules`)}var K=new Set([`node_modules`,`vendor`,`vendors`,`external`]),q=/\.(?:min|bundle)\.(?:js|css)$/,J=new Set([`lib`,`theme`]);function Y(e){let t=e.split(`/`);return t.some(e=>K.has(e))||t.some((e,n)=>{let r=t[n+1];return e===`wwwroot`&&r!==void 0&&J.has(r)})?!0:q.test(e)}function X(e,t){return[...new Set([...e,...t])]}function Z(e,t,n){return H(e).filter(e=>z(e.version,t)>0&&z(e.version,n)<=0).map(e=>e.table)}function ee(e,t){let n=Object.entries(t);if(n.length===0)return e;let r=(e,t)=>e.flatMap(e=>[e,...n.filter(([,n])=>e[t]===n).map(([n])=>({...e,[t]:n}))]),i={...e};return e.props!==void 0&&(i.props=r(e.props,`package`)),e.componentProps!==void 0&&(i.componentProps=r(e.componentProps,`package`)),e.propValues!==void 0&&(i.propValues=r(e.propValues,`package`)),e.propSplits!==void 0&&(i.propSplits=r(e.propSplits,`package`)),e.valueSplits!==void 0&&(i.valueSplits=r(e.valueSplits,`package`)),e.components!==void 0&&(i.components=r(e.components,`package`)),e.source!==void 0&&(i.source={...e.source,flags:r(e.source.flags,`importedFrom`)}),i}function Q(e,b,x,C,w,E={}){C&&w(`dry run: nothing written`);let D=x.map(e=>ee(e,E)),k=[],A=[],j=[],M=b.filter(e=>a(e)&&!Y(e)),N=D.map(()=>new Set);if(D.some(e=>(e.css.ownable??[]).length>0))for(let n of M){let r=S(O(e,n),`utf8`);D.forEach((e,i)=>{for(let a of o(r,n,e))t(N[i],`own declarations of a rename table`).add(a)})}let P=U(e,[`package.json`,`:(glob)**/package.json`]).filter(e=>!G(e)),F=new Map,I=D.map(t=>y(e,[...M,...P],t,F));for(let a of M){let o=S(O(e,a),`utf8`),y=o,b=e=>{for(let t of e)t.from!==t.to&&(k.push({file:a,line:t.line,from:t.from,to:t.to}),w(`${a}:${t.line} ${t.from} -> ${t.to}`))},x=e=>{A.push({file:a,line:e.line,name:e.name,hint:e.hint}),w(`choose ${a}:${e.line} ${e.name}: ${e.hint}`)},E=e=>{for(let t of e)t.message.startsWith(`skipped, it does not parse`)?w(`skipped ${a}: ${t.message}`):x({line:t.line,name:t.path,hint:t.message})};for(let[e,o]of D.entries()){let S=i(y,a,o,N[e]);y=S.text,b(S.hits);for(let e of S.choose)x(e);for(let e of S.checkRole)w(`verify ${a}:${e.line} ${e.from} -> ${e.to}`);let C=g(y,a,o.themeReads);y=C.text,b(C.hits),E(C.findings);let T=[n=>v(n,a,t(I[e],`wrapper index of a rename table`)),e=>h(e,a,o.props),e=>f(e,a,o.componentProps),e=>m(e,a,o.propValues),e=>_(e,a,o.valueSplits??[]),e=>p(e,a,o.propSplits),e=>s(e,a,o.razorAttributes),e=>r(e,a,o.components??[]),e=>c(e,a,o.razorTags??[]),e=>l(e,a,o.razorValueSplits??[]),e=>n(e,a,o.classes??[]),e=>u(e,a,o.markup),e=>d(e,a,o.source)];for(let e of T){let t=e(y);y=t.text,b(t.hits),E(t.findings)}}y!==o&&(j.push(a),C||T(O(e,a),y,`utf8`))}return{hits:k,choose:A,changedFiles:j}}function te(e){let n=/^([ \t]+)\S/m.exec(e);return n?t(n[1],`indentation of a package.json`):4}function ne(e,t,n,r,i){let a=[];for(let o of U(e,[`package.json`,`:(glob)**/package.json`])){if(G(o))continue;let s=S(O(e,o),`utf8`),c=JSON.parse(s),l=!1;for(let e of[`dependencies`,`devDependencies`]){let r=c[e];if(r)for(let e of n.npm){if(!Object.hasOwn(r,e))continue;let n=r[e];I.test(n)||n===t||(r[e]=t,l=!0,i(`pin ${o}: ${e} ${n} -> ${t}`))}}if(l&&(a.push(o),r)){let t=JSON.stringify(c,null,te(s));s.endsWith(`
1
+ import{brand as e}from"../build.js";import{present as t}from"../present.js";import{applyClasses as n}from"./classes.js";import{applyComponents as r}from"./components.js";import{applyCsharpEnumArguments as i}from"./csharpEnumArguments.js";import{applyCssTable as a,isCssTarget as o,ownDeclarations as s}from"./css.js";import{applyRazorAttributes as c}from"./razorAttributes.js";import{applyRazorEnumAttributes as l}from"./razorEnumAttributes.js";import{applyRazorTags as u}from"./razorTags.js";import{applyRazorValueSplits as d}from"./razorValueSplits.js";import{applyMarkup as f,applySource as p}from"./source.js";import{applyComponentProps as m,applyPropSplits as h,applyPropValues as g,applyProps as _,applyThemeReads as v}from"./themeReads.js";import{applyValueSplits as ee}from"./valueSplits.js";import{applyWrapperValues as te,findWrappers as y}from"./wrapperValues.js";import{createRequire as b}from"node:module";import{existsSync as x,readFileSync as S,readdirSync as C,realpathSync as w,writeFileSync as T}from"node:fs";import{dirname as E,isAbsolute as D,join as O,relative as k,resolve as A,sep as j}from"node:path";import{fileURLToPath as M,pathToFileURL as N}from"node:url";import{spawnSync as P}from"node:child_process";var F=/^\d+\.\d+\.\d+$/,I=/^(?:workspace:|file:|link:)/,L=`WEBORITY_UPGRADE_FROM`;function R(e){if(typeof e!=`string`||!F.test(e))throw Error(`invalid version "${e}"`)}function z(e,n){R(e),R(n);let r=e.split(`.`).map(Number),i=n.split(`.`).map(Number);for(let e=0;e<3;e++)if(r[e]!==i[e])return t(r[e],`version part`)-t(i[e],`version part`);return 0}function B(){let e=E(M(import.meta.url));for(;;){let t=O(e,`package.json`);if(x(t)&&JSON.parse(S(t,`utf8`)).name===`@webority/tokens`)return e;let n=E(e);if(n===e)throw Error(`cannot find the @webority/tokens package folder`);e=n}}function ne(){return JSON.parse(S(O(B(),`package.json`),`utf8`)).version}function V(e){let t=[];for(let n of C(e)){if(!n.endsWith(`.json`))continue;let r=n.slice(0,-5);F.test(r)&&t.push({version:r,table:JSON.parse(S(O(e,n),`utf8`))})}return t.sort((e,t)=>z(e.version,t.version))}function H(e,t){let n=P(`git`,[`ls-files`,`-z`,`--`,...t],{cwd:e,encoding:`utf8`,windowsHide:!0,maxBuffer:67108864});if(n.status!==0)throw Error(`not a git repository: ${e}`);let r=n.stdout.split(`\0`).filter(Boolean).map(e=>e.split(`\\`).join(`/`)).filter(t=>x(O(e,t)));return[...new Set(r)]}function U(e,t){let n=H(e,t??[`.`]);if(t!==void 0&&n.length===0)throw Error(`no tracked files under ${t.join(`, `)}`);return n}function W(e){return e.split(`/`).includes(`node_modules`)}var re=new Set([`node_modules`,`vendor`,`vendors`,`external`]),ie=/\.(?:min|bundle)\.(?:js|css)$/,G=new Set([`lib`,`theme`]);function K(e){let t=e.split(`/`);return t.some(e=>re.has(e))||t.some((e,n)=>{let r=t[n+1];return e===`wwwroot`&&r!==void 0&&G.has(r)})?!0:ie.test(e)}var q=new Set([`bin`,`obj`,`node_modules`]);function J(e){let t=e.split(`/`);return e.toLowerCase().endsWith(`.cs`)&&!t.some(e=>q.has(e))}function Y(e,t){return[...new Set([...e,...t])]}function X(e,t,n){return V(e).filter(e=>z(e.version,t)>0&&z(e.version,n)<=0).map(e=>e.table)}function ae(e,t){let n=Object.entries(t);if(n.length===0)return e;let r=(e,t)=>e.flatMap(e=>[e,...n.filter(([,n])=>e[t]===n).map(([n])=>({...e,[t]:n}))]),i={...e};return e.props!==void 0&&(i.props=r(e.props,`package`)),e.componentProps!==void 0&&(i.componentProps=r(e.componentProps,`package`)),e.propValues!==void 0&&(i.propValues=r(e.propValues,`package`)),e.propSplits!==void 0&&(i.propSplits=r(e.propSplits,`package`)),e.valueSplits!==void 0&&(i.valueSplits=r(e.valueSplits,`package`)),e.components!==void 0&&(i.components=r(e.components,`package`)),e.source!==void 0&&(i.source={...e.source,flags:r(e.source.flags,`importedFrom`)}),i}function Z(e,b,x,C,w,E={}){C&&w(`dry run: nothing written`);let D=x.map(e=>ae(e,E)),k=[],A=[],j=[],M=D.some(e=>(e.csharpEnumArguments??[]).length>0),N=b.filter(e=>(o(e)||M&&J(e))&&!K(e)),P=D.map(()=>new Set);if(D.some(e=>(e.css.ownable??[]).length>0))for(let n of N){let r=S(O(e,n),`utf8`);D.forEach((e,i)=>{for(let a of s(r,n,e))t(P[i],`own declarations of a rename table`).add(a)})}let F=H(e,[`package.json`,`:(glob)**/package.json`]).filter(e=>!W(e)),I=new Map,L=D.map(t=>y(e,[...N,...F],t,I));for(let o of N){let s=S(O(e,o),`utf8`),y=s,b=e=>{for(let t of e)t.from!==t.to&&(k.push({file:o,line:t.line,from:t.from,to:t.to}),w(`${o}:${t.line} ${t.from} -> ${t.to}`))},x=e=>{A.push({file:o,line:e.line,name:e.name,hint:e.hint}),w(`choose ${o}:${e.line} ${e.name}: ${e.hint}`)},E=e=>{for(let t of e)t.message.startsWith(`skipped, it does not parse`)?w(`skipped ${o}: ${t.message}`):x({line:t.line,name:t.path,hint:t.message})};for(let[e,s]of D.entries()){let S=a(y,o,s,P[e]);y=S.text,b(S.hits);for(let e of S.choose)x(e);for(let e of S.checkRole)w(`verify ${o}:${e.line} ${e.from} -> ${e.to}`);let C=v(y,o,s.themeReads);y=C.text,b(C.hits),E(C.findings);let T=[n=>te(n,o,t(L[e],`wrapper index of a rename table`)),e=>_(e,o,s.props),e=>m(e,o,s.componentProps),e=>g(e,o,s.propValues),e=>ee(e,o,s.valueSplits??[]),e=>h(e,o,s.propSplits),e=>c(e,o,s.razorAttributes),e=>r(e,o,s.components??[]),e=>u(e,o,s.razorTags??[]),e=>d(e,o,s.razorValueSplits??[]),e=>l(e,o,s.razorEnumAttributes??[]),e=>i(e,o,s.csharpEnumArguments??[]),e=>n(e,o,s.classes??[]),e=>f(e,o,s.markup),e=>p(e,o,s.source)];for(let e of T){let t=e(y);y=t.text,b(t.hits),E(t.findings)}}y!==s&&(j.push(o),C||T(O(e,o),y,`utf8`))}return{hits:k,choose:A,changedFiles:j}}function oe(e){let n=/^([ \t]+)\S/m.exec(e);return n?t(n[1],`indentation of a package.json`):4}function se(e,t,n,r,i){let a=[];for(let o of H(e,[`package.json`,`:(glob)**/package.json`])){if(W(o))continue;let s=S(O(e,o),`utf8`),c=JSON.parse(s),l=!1;for(let e of[`dependencies`,`devDependencies`]){let r=c[e];if(r)for(let e of n.npm){if(!Object.hasOwn(r,e))continue;let n=r[e];I.test(n)||n===t||(r[e]=t,l=!0,i(`pin ${o}: ${e} ${n} -> ${t}`))}}if(l&&(a.push(o),r)){let t=JSON.stringify(c,null,oe(s));s.endsWith(`
2
2
  `)&&(t+=`
3
3
  `),s.includes(`\r
4
4
  `)&&(t=t.replace(/\n/g,`\r
5
- `)),T(O(e,o),t,`utf8`)}}return a}function re(e,t,n,r,i){let a=[];for(let o of U(e,[`Directory.Packages.props`,`:(glob)**/Directory.Packages.props`])){if(G(o))continue;let s=S(O(e,o),`utf8`),c=!1,l=s.replace(/<PackageVersion\b[^>]*>/g,e=>{let r=/\sInclude="([^"]*)"/.exec(e)?.[1],a=/\sVersion="([^"]*)"/.exec(e)?.[1];if(r===void 0||a===void 0)return e;let s=/^\[([^\]]*)\]$/.exec(a),l=s?s[1]:a,u=s?`[${t}]`:t;return!n.nuget.includes(r)||l===t?e:(i(`pin ${o}: ${r} ${a} -> ${u}`),c=!0,e.replace(/(\sVersion=")[^"]*(")/,`$1${u}$2`))});c&&(a.push(o),r&&T(O(e,o),l,`utf8`))}return a}function ie(e){let t;try{t=b(O(e,`package.json`)).resolve(`@webority/repo-checks/lockstep.json`)}catch{throw Error(`add @webority/repo-checks at the lockstep version and run again`)}let n=JSON.parse(S(t,`utf8`));if(!ae(n))throw Error(`${t} must hold { npm: string[], nuget: string[] }`);return n}function $(e){return Array.isArray(e)&&e.every(e=>typeof e==`string`)}function ae(e){return typeof e!=`object`||!e||!(`npm`in e)||!(`nuget`in e)?!1:$(e.npm)&&$(e.nuget)}var oe=[{file:`pnpm-lock.yaml`,manager:`pnpm`,command:[`corepack`,`pnpm`,`install`]},{file:`package-lock.json`,manager:`npm`,command:[`npm`,`install`]}];function se(e){let n=oe.filter(t=>x(O(e,t.file)));if(n.length===0)throw Error(`no pnpm-lock.yaml or package-lock.json in ${e}`);if(n.length>1)throw Error(`${e} has both ${t(n[0],`first lockfile entry`).file} and ${t(n[1],`second lockfile entry`).file}; keep one lockfile`);return t(n[0],`lockfile entry`)}function ce(e,t){let n=A(e,t),r=k(e,n);if(r===``||D(r)||r.split(j)[0]===`..`)throw Error(`--app ${t}: give a folder inside the repo root`);if(!x(O(n,`package.json`)))throw Error(`--app ${t}: no package.json in that folder`);return n}function le(e,t,n){return P(e,t,{cwd:n.cwd,env:process.env,stdio:`inherit`,windowsHide:!0,shell:process.platform===`win32`})}async function ue({appRoot:e,designRoot:t,app:n,version:r,from:i,aliases:a}){let o=w.native(O(e,`node_modules`,`@webority`,`tokens`)),s=JSON.parse(S(O(o,`package.json`),`utf8`))?.exports?.[`.`],c=typeof s==`string`?s:s?.default;if(typeof c!=`string`)throw Error(`cannot find the installed @webority/tokens entry`);process.env[L]=i;try{return await(await import(N(O(o,c)).href)).upgrade({root:t,app:n,version:r,dryRun:!1,aliases:a})}finally{delete process.env[L]}}async function de({root:e,designRoot:t,version:n,dryRun:r,from:i,dir:a,log:o,brandFn:s,aliases:c}){let l=Z(a,i,n),u=Q(e,W(e),l,r,o,c);return r||await s({root:t}),u}async function fe({root:e,designRoot:n,app:r,version:i,dryRun:a,deps:o,log:s,aliases:c}){let l=O(e,`node_modules`,`@webority`,`tokens`,`package.json`);if(!x(l))throw Error(`@webority/tokens is not installed; add it at the lockstep version and run again`);let u=JSON.parse(S(l,`utf8`)).version,d=ie(e),f=a?null:se(e),p=[...ne(e,i,d,!a,s),...re(e,i,d,!a,s)];if(a){s(`dry run: install skipped; tables are those of the installed ${u}`);let t=Z(o.renamesDir??O(e,`node_modules`,`@webority`,`tokens`,`renames`),u,i),n=Q(e,W(e),t,!0,s,c);return{...n,changedFiles:X(p,n.changedFiles)}}if(f===null)throw Error(`webority-tokens: package manager is missing.`);let m=o.run??le,[h,...g]=f.command,{status:_}=await m(t(h,`install command`),g,{cwd:e});if(_!==0)throw Error(`${f.manager} install failed with exit code ${_}`);let v=await(o.reenter??ue)({appRoot:e,designRoot:n,app:r,version:i,dryRun:!1,from:u,aliases:c});return{...v,changedFiles:X(p,v.changedFiles)}}async function pe(t,n={}){let r=t.version;R(r);let i=t.root??process.cwd(),a=t.app===void 0?i:ce(i,t.app),o=t.dryRun??!1,s=t.aliases??{},c=n.log??(e=>process.stdout.write(`${e}\n`)),l=()=>n.renamesDir??O(B(),`renames`);if(Array.isArray(t.paths)&&t.paths.length>0){let e=H(l()).filter(e=>e.version===r).map(e=>e.table);if(e.length===0&&r!==(n.ownVersion??V)())throw Error(`no rename table for ${r}`);return Q(a,W(a,t.paths),e,o,c,s)}if(!x(O(i,`.webority`,`design.json`)))throw Error(`write .webority/design.json (design-map.md) and run again`);let u=process.env[L];return u?de({root:a,designRoot:i,version:r,dryRun:o,from:u,dir:l(),log:c,brandFn:n.brand??e,aliases:s}):fe({root:a,designRoot:i,app:t.app,version:r,dryRun:o,deps:n,log:c,aliases:s})}export{pe as upgrade};
5
+ `)),T(O(e,o),t,`utf8`)}}return a}function ce(e,t,n,r,i){let a=[];for(let o of H(e,[`Directory.Packages.props`,`:(glob)**/Directory.Packages.props`])){if(W(o))continue;let s=S(O(e,o),`utf8`),c=!1,l=s.replace(/<PackageVersion\b[^>]*>/g,e=>{let r=/\sInclude="([^"]*)"/.exec(e)?.[1],a=/\sVersion="([^"]*)"/.exec(e)?.[1];if(r===void 0||a===void 0)return e;let s=/^\[([^\]]*)\]$/.exec(a),l=s?s[1]:a,u=s?`[${t}]`:t;return!n.nuget.includes(r)||l===t?e:(i(`pin ${o}: ${r} ${a} -> ${u}`),c=!0,e.replace(/(\sVersion=")[^"]*(")/,`$1${u}$2`))});c&&(a.push(o),r&&T(O(e,o),l,`utf8`))}return a}function le(e){let t;try{t=b(O(e,`package.json`)).resolve(`@webority/repo-checks/lockstep.json`)}catch{throw Error(`add @webority/repo-checks at the lockstep version and run again`)}let n=JSON.parse(S(t,`utf8`));if(!ue(n))throw Error(`${t} must hold { npm: string[], nuget: string[] }`);return n}function Q(e){return Array.isArray(e)&&e.every(e=>typeof e==`string`)}function ue(e){return typeof e!=`object`||!e||!(`npm`in e)||!(`nuget`in e)?!1:Q(e.npm)&&Q(e.nuget)}var de=[{file:`pnpm-lock.yaml`,manager:`pnpm`,command:[`corepack`,`pnpm`,`install`]},{file:`package-lock.json`,manager:`npm`,command:[`npm`,`install`]}];function fe(e){let n=de.filter(t=>x(O(e,t.file)));if(n.length===0)throw Error(`no pnpm-lock.yaml or package-lock.json in ${e}`);if(n.length>1)throw Error(`${e} has both ${t(n[0],`first lockfile entry`).file} and ${t(n[1],`second lockfile entry`).file}; keep one lockfile`);return t(n[0],`lockfile entry`)}function pe(e,t){let n=A(e,t),r=k(e,n);if(r===``||D(r)||r.split(j)[0]===`..`)throw Error(`--app ${t}: give a folder inside the repo root`);if(!x(O(n,`package.json`)))throw Error(`--app ${t}: no package.json in that folder`);return n}function $(e,t,n){return P(e,t,{cwd:n.cwd,env:process.env,stdio:`inherit`,windowsHide:!0,shell:process.platform===`win32`})}async function me({appRoot:e,designRoot:t,app:n,version:r,from:i,aliases:a}){let o=w.native(O(e,`node_modules`,`@webority`,`tokens`)),s=JSON.parse(S(O(o,`package.json`),`utf8`))?.exports?.[`.`],c=typeof s==`string`?s:s?.default;if(typeof c!=`string`)throw Error(`cannot find the installed @webority/tokens entry`);process.env[L]=i;try{return await(await import(N(O(o,c)).href)).upgrade({root:t,app:n,version:r,dryRun:!1,aliases:a})}finally{delete process.env[L]}}async function he({root:e,designRoot:t,version:n,dryRun:r,from:i,dir:a,log:o,brandFn:s,aliases:c}){let l=X(a,i,n),u=Z(e,U(e),l,r,o,c);return r||await s({root:t}),u}async function ge({root:e,designRoot:n,app:r,version:i,dryRun:a,deps:o,log:s,aliases:c}){let l=O(e,`node_modules`,`@webority`,`tokens`,`package.json`);if(!x(l))throw Error(`@webority/tokens is not installed; add it at the lockstep version and run again`);let u=JSON.parse(S(l,`utf8`)).version,d=le(e),f=a?null:fe(e),p=[...se(e,i,d,!a,s),...ce(e,i,d,!a,s)];if(a){s(`dry run: install skipped; tables are those of the installed ${u}`);let t=X(o.renamesDir??O(e,`node_modules`,`@webority`,`tokens`,`renames`),u,i),n=Z(e,U(e),t,!0,s,c);return{...n,changedFiles:Y(p,n.changedFiles)}}if(f===null)throw Error(`webority-tokens: package manager is missing.`);let m=o.run??$,[h,...g]=f.command,{status:_}=await m(t(h,`install command`),g,{cwd:e});if(_!==0)throw Error(`${f.manager} install failed with exit code ${_}`);let v=await(o.reenter??me)({appRoot:e,designRoot:n,app:r,version:i,dryRun:!1,from:u,aliases:c});return{...v,changedFiles:Y(p,v.changedFiles)}}async function _e(t,n={}){let r=t.version;R(r);let i=t.root??process.cwd(),a=t.app===void 0?i:pe(i,t.app),o=t.dryRun??!1,s=t.aliases??{},c=n.log??(e=>process.stdout.write(`${e}\n`)),l=()=>n.renamesDir??O(B(),`renames`);if(Array.isArray(t.paths)&&t.paths.length>0){let e=V(l()).filter(e=>e.version===r).map(e=>e.table);if(e.length===0&&r!==(n.ownVersion??ne)())throw Error(`no rename table for ${r}`);return Z(a,U(a,t.paths),e,o,c,s)}if(!x(O(i,`.webority`,`design.json`)))throw Error(`write .webority/design.json (design-map.md) and run again`);let u=process.env[L];return u?he({root:a,designRoot:i,version:r,dryRun:o,from:u,dir:l(),log:c,brandFn:n.brand??e,aliases:s}):ge({root:a,designRoot:i,app:t.app,version:r,dryRun:o,deps:n,log:c,aliases:s})}export{_e as upgrade};
@@ -0,0 +1,19 @@
1
+ import type { RazorEnumAttributeRule } from "../../renames/renames.d.ts";
2
+ export type RazorEnumHit = {
3
+ line: number;
4
+ from: string;
5
+ to: string;
6
+ };
7
+ export type RazorEnumFinding = {
8
+ file: string;
9
+ line: number;
10
+ path: string;
11
+ message: string;
12
+ };
13
+ export type RazorEnumResult = {
14
+ text: string;
15
+ hits: RazorEnumHit[];
16
+ findings: RazorEnumFinding[];
17
+ };
18
+ /** @param file repo-relative, forward slashes */
19
+ export declare function applyRazorEnumAttributes(source: string, file: string, rules: RazorEnumAttributeRule[]): RazorEnumResult;
@@ -0,0 +1,5 @@
1
+ import{present as e}from"../present.js";import{readRazorAttributes as t,tagOccurrences as n}from"./tagScan.js";import{applyEdits as r}from"./themeReads.js";var i=new Set([`.cshtml`,`.razor`]),a=/^([1-9]\d*)(?:px)?$/i,o=/^([ \t]*)@addTagHelper[ \t]+\*[ \t]*,[ \t]*Webority\.Ui\.Razor[ \t]*\r?$/m,s=/^[ \t]*@using[ \t]+Webority\.Ui\.Razor(?![\w.])/m,c=`@using Webority.Ui.Razor`,l=`()[]{},:`,u=e=>{let t=/\.[^./]*$/.exec(e);return t?t[0].toLowerCase():``},d=(e,t)=>e.slice(0,t).split(`
2
+ `).length;function f(e,t){return Object.hasOwn(e.values,t)?e.values[t]:Object.values(e.values).find(e=>e.toLowerCase()===t)}function p(e){return Object.values(e.values).join(`, `)}function m(e,t){return`${t} is not a ${e.enum}. Use one of: ${p(e)}.`}function h(e,t){return`takes a ${e.enum} now; change the type that "${t}" returns from string to ${e.enum}.`}function g(e){let t=[],n=0;for(;n<e.length;){let r=e.charAt(n);if(/\s/.test(r)){n++;continue}let i=n,a=`word`;if(r===`"`){for(i=n+1;i<e.length&&e.charAt(i)!==`"`;)i+=e.charAt(i)===`\\`?2:1;if(i>=e.length)return null;i+=1,a=`str`}else if(r===`?`&&(e.charAt(n+1)===`?`||e.charAt(n+1)===`.`))i=n+2;else if(r===`?`||l.includes(r))i=n+1,a=`punct`;else for(;i<e.length&&!/[\s"?:()[\]{},]/.test(e.charAt(i));)i++;t.push({kind:a,text:e.slice(n,i),start:n,end:i}),n=i}return t}function _(e){let t=e.map(()=>-1),n=[];for(let r=0;r<e.length;r++){let i=e[r];if(i?.kind===`punct`){if(`([{`.includes(i.text))n.push(r);else if(`)]}`.includes(i.text)){let e=n.pop();if(e===void 0)return null;t[e]=r}}}return n.length===0?t:null}var v=e=>e?.kind===`punct`&&`([{`.includes(e.text);function y(e,t,n,r,i){if(r-n>=2&&e[n]?.text===`(`&&t[n]===r-1)return y(e,t,n+1,r-1,i);let a=-1;for(let i=n;i<r&&a===-1;i++){let n=e[i];v(n)?i=t[i]??r:n?.kind===`punct`&&n.text===`?`&&(a=i)}if(a===-1)return i.push({lo:n,hi:r}),!1;let o=0,s=-1;for(let n=a+1;n<r&&s===-1;n++){let i=e[n];v(i)?n=t[n]??r:i?.kind===`punct`&&i.text===`?`?o++:i?.kind===`punct`&&i.text===`:`&&(o===0?s=n:o--)}return s===-1?(i.push({lo:n,hi:r}),!1):(y(e,t,a+1,s,i),y(e,t,s+1,r,i),!0)}function b(e,t,n,r,i){let a=n.hi-n.lo===1?t[n.lo]:void 0;if(a?.kind===`str`&&!a.text.includes(`\\`)&&!a.text.includes(`@`)){let t=f(e,a.text.slice(1,-1).toLowerCase());return t===void 0?{problem:m(e,a.text)}:{replace:{start:r+a.start,end:r+a.end,text:`${e.enum}.${t}`}}}return a?.kind===`word`&&Object.values(e.values).some(t=>a.text===`${e.enum}.${t}`)?{}:{problem:h(e,i)}}function x(e,t){let n=g(t.value.slice(1)),r=n===null?null:_(n);if(n===null||r===null)return{edits:[],message:h(e,t.value)};let i=[];y(n,r,0,n.length,i);let a=[],o;for(let r of i){let i=b(e,n,r,t.valueStart+1,t.value);i.problem===void 0?i.replace!==void 0&&a.push(i.replace):o??=i.problem}return o===void 0?{edits:a}:{edits:[],message:o}}function S(t,n,r,i){if(r.kind!==`quoted`)return{edits:[],message:`write it as ${r.name}="<member>"; one of: ${p(t)}.`};let o=t.numberAttribute===void 0?null:a.exec(r.value);if(t.numberAttribute!==void 0&&o!==null){if(i.has(t.numberAttribute))return{edits:[],message:`<${n}> already sets ${t.numberAttribute}; merge ${t.attribute} into it by hand`};let a=e(o[1],`the pixel count`),s=[{start:r.nameStart,end:r.nameEnd,text:t.numberAttribute}];return a!==r.value&&s.push({start:r.valueStart,end:r.valueEnd,text:a}),{edits:s}}if(r.value.startsWith(`@`))return x(t,r);let s=Object.values(t.values).some(e=>r.value===`${t.enum}.${e}`);if(s&&t.nullable===!0)return{edits:[]};let c=s?r.value.slice(t.enum.length+1):f(t,r.value.toLowerCase());if(c===void 0)return{edits:[],message:m(t,`"${r.value}"`)};let l=t.nullable===!0?`${t.enum}.${c}`:c;return l===r.value?{edits:[]}:{edits:[{start:r.valueStart,end:r.valueEnd,text:l}]}}function C(e,a,l){if(l.length===0||!i.has(u(a)))return{text:e,hits:[],findings:[]};let f=[],p=[],m=[];for(let i of l)for(let o of i.tags)for(let{nameEnd:s,end:c}of n(e,o)){if(c===-1){m.push({file:a,line:d(e,s),path:`<${o}>`,message:`the tag could not be read (a quote in an attribute value does not pair up); set it by hand`});continue}let n=t(e,s,c),l=new Set(n.map(e=>e.name));for(let t of n){if(t.name!==i.attribute)continue;let n=d(e,t.nameStart),s=S(i,o,t,l);if(s.message!==void 0){m.push({file:a,line:n,path:`<${o}> ${i.attribute}`,message:s.message});continue}if(s.edits.length===0)continue;f.push(...s.edits);let c=r(e.slice(t.nameStart,t.attrEnd),s.edits.map(e=>({start:e.start-t.nameStart,end:e.end-t.nameStart,text:e.text})),a);p.push({line:n,from:e.slice(t.nameStart,t.attrEnd),to:c.replace(/\n\s*/g,` `)})}}if((a.split(`/`).pop()??``).toLowerCase()===`_viewimports.cshtml`){let t=o.exec(e);if(t!==null&&!s.test(e)){let n=e.includes(`\r
3
+ `)?`\r
4
+ `:`
5
+ `,r=t.index;f.push({start:r,end:r,text:`${t[1]??``}${c}${n}`}),p.push({line:d(e,r),from:``,to:c})}}return p.sort((e,t)=>e.line-t.line||(e.from<t.from?-1:+(e.from>t.from))),m.sort((e,t)=>e.line-t.line||(e.path<t.path?-1:+(e.path>t.path))),{text:r(e,f,a),hits:p,findings:m}}export{C as applyRazorEnumAttributes};
@@ -1,2 +1,2 @@
1
- import{present as e}from"../present.js";import{findQuoteEnd as t,tagOccurrences as n}from"./tagScan.js";var r=new Set([`.cshtml`,`.razor`]),i=/(\s*)([^\s=/>"']+)(\s*=\s*)?/y,a=/[^\s"'>]+/y,o=e=>e.replace(/[.*+?^${}()|[\]\\]/g,`\\$&`),s=e=>{let t=/\.[^./]*$/.exec(e);return t?t[0].toLowerCase():``},c=e=>{let t=[0];for(let n=0;n<e.length;n++)e[n]===`
2
- `&&t.push(n+1);return t},l=(t,n)=>{let r=0,i=t.length-1;for(;r<i;){let a=r+i+1>>1;e(t[a],`line start`)<=n?r=a:i=a-1}return r+1},u=(e,t)=>e<t?-1:+(e>t);function d(n,r,o){let s=[],c=r;for(;;){i.lastIndex=c;let r=i.exec(n);if(r===null)break;let l=e(r[2],`the attribute name`),u=r.index+e(r[1],`the whitespace before the attribute name`).length,d=u+l.length,f={name:l,nameStart:u,nameEnd:d,wsStart:r.index,kind:`none`,attrEnd:d},p=r.index+r[0].length;if(r[3]!==void 0&&(n[p]===`"`||n[p]===`'`)){let e=t(n,p);if(e===-1)break;f.kind=`quoted`,f.value=n.slice(p+1,e),f.valueStart=p+1,f.valueEnd=e,f.attrEnd=e+1}else if(r[3]!==void 0){a.lastIndex=p;let e=a.exec(n);e!==null&&(f.kind=`bare`,f.attrEnd=p+e[0].length)}if(f.attrEnd>o)break;s.push(f),c=f.attrEnd}return s}function f(t,r,i,a){let s=[],c=[],u=[],f=t=>Object.hasOwn(r.renameAttributes,t)?e(r.renameAttributes[t],`the renamed attribute`):t,p=r.from!==r.to,m=n(t,r.from),h=m.filter(e=>e.end===-1);if(h.length>0){for(let{nameEnd:e}of h)u.push({file:a,line:l(i,e),path:`<${r.from}>`,message:`the tag could not be read (a quote in an attribute value does not pair up); rename it by hand`});return{edits:[],hits:[],findings:u}}for(let{nameEnd:n,end:o}of m){let m=l(i,n),h=t.slice(n,o).trimEnd().endsWith(`/`),g=d(t,n,o);for(let[e,t]of Object.entries(r.removeAttributes))g.some(t=>t.name===e)&&u.push({file:a,line:m,path:`<${r.from}> ${e}`,message:t});let _=[];for(let e of g){let t=f(e.name);t!==e.name&&(s.push({start:e.nameStart,end:e.nameEnd,text:t}),c.push({line:l(i,e.nameStart),from:e.name,to:t}))}let v=g.map(e=>f(e.name));for(let t of g){let n=f(t.name),a=Object.hasOwn(r.valueMaps,n)?r.valueMaps[n]:void 0;if(t.kind!==`quoted`||a===void 0||t.value===void 0||!Object.hasOwn(a,t.value))continue;let o=e(a[t.value],`the mapped value`),u=e(t.valueStart,`the start of the quoted value`);s.push({start:u,end:e(t.valueEnd,`the end of the quoted value`),text:o}),c.push({line:l(i,u),from:`${n}="${t.value}"`,to:`${n}="${o}"`})}for(let[e,t]of Object.entries(r.addAttributes))v.includes(e)||_.push(` ${e}="${t}"`);_.length>0&&s.push({start:n,end:n,text:_.join(``)}),(p||_.length>0)&&c.push({line:m,from:`<${r.from}`,to:`<${r.to}${_.join(``)}`}),p&&s.push({start:n-r.from.length,end:n,text:r.to});let y=r.attributeToContent===void 0?void 0:g.find(e=>e.name===r.attributeToContent);if(y===void 0)continue;if(y.kind!==`quoted`){u.push({file:a,line:m,path:`<${r.from}> ${y.name}`,message:`${y.name} must hold a value that becomes the element content; set it by hand`});continue}if(s.push({start:y.wsStart,end:y.attrEnd,text:``}),c.push({line:m,from:`${y.name}="${y.value}"`,to:`element content`}),h){let e=t.lastIndexOf(`/`,o);for(;/\s/.test(t[e-1]??``);)e--;s.push({start:e,end:o+1,text:`>${y.value}</${r.to}>`});continue}let b=t.indexOf(`</${r.from}`,o+1);if(b===-1)throw Error(`no closing </${r.from}> for the element at ${a}:${m}`);t.slice(o+1,b).trim()===``?s.push({start:o+1,end:b,text:e(y.value,`the value of the moved attribute`)}):(u.push({file:a,line:m,path:`<${r.from}> ${y.name}`,message:`the element already has content; move ${y.name} into it by hand`}),s.pop(),c.pop())}if(p)for(let e of t.matchAll(RegExp(`</${o(r.from)}(?=\\s*>)`,`g`))){let t=e.index+2;s.push({start:t,end:t+r.from.length,text:r.to}),c.push({line:l(i,t),from:`</${r.from}`,to:`</${r.to}`})}return{edits:s,hits:c,findings:u}}function p(e,t,n){let{edits:r,hits:i,findings:a}=f(e,n,c(e),t);r.sort((e,t)=>t.start-e.start||t.end-e.end);let o=e;for(let e of r)o=o.slice(0,e.start)+e.text+o.slice(e.end);return{text:o,hits:i,findings:a}}function m(e,t,n){if(n.length===0||!r.has(s(t)))return{text:e,hits:[],findings:[]};let i=e,a=[],o=[];for(let e of n){let n=p(i,t,e);i=n.text,a.push(...n.hits),o.push(...n.findings)}return a.sort((e,t)=>e.line-t.line||u(e.from,t.from)),o.sort((e,t)=>e.line-t.line||u(e.path,t.path)),{text:i,hits:a,findings:o}}export{m as applyRazorTags};
1
+ import{present as e}from"../present.js";import{readRazorAttributes as t,tagOccurrences as n}from"./tagScan.js";var r=new Set([`.cshtml`,`.razor`]),i=e=>e.replace(/[.*+?^${}()|[\]\\]/g,`\\$&`),a=e=>{let t=/\.[^./]*$/.exec(e);return t?t[0].toLowerCase():``},o=e=>{let t=[0];for(let n=0;n<e.length;n++)e[n]===`
2
+ `&&t.push(n+1);return t},s=(t,n)=>{let r=0,i=t.length-1;for(;r<i;){let a=r+i+1>>1;e(t[a],`line start`)<=n?r=a:i=a-1}return r+1},c=(e,t)=>e<t?-1:+(e>t);function l(r,a,o,c){let l=[],u=[],d=[],f=t=>Object.hasOwn(a.renameAttributes,t)?e(a.renameAttributes[t],`the renamed attribute`):t,p=a.from!==a.to,m=n(r,a.from),h=m.filter(e=>e.end===-1);if(h.length>0){for(let{nameEnd:e}of h)d.push({file:c,line:s(o,e),path:`<${a.from}>`,message:`the tag could not be read (a quote in an attribute value does not pair up); rename it by hand`});return{edits:[],hits:[],findings:d}}for(let{nameEnd:n,end:i}of m){let m=s(o,n),h=r.slice(n,i).trimEnd().endsWith(`/`),g=t(r,n,i);for(let[e,t]of Object.entries(a.removeAttributes))g.some(t=>t.name===e)&&d.push({file:c,line:m,path:`<${a.from}> ${e}`,message:t});let _=[];for(let e of g){let t=f(e.name);t!==e.name&&(l.push({start:e.nameStart,end:e.nameEnd,text:t}),u.push({line:s(o,e.nameStart),from:e.name,to:t}))}let v=g.map(e=>f(e.name));for(let t of g){let n=f(t.name),r=Object.hasOwn(a.valueMaps,n)?a.valueMaps[n]:void 0;if(t.kind!==`quoted`||r===void 0||t.value===void 0||!Object.hasOwn(r,t.value))continue;let i=e(r[t.value],`the mapped value`),c=e(t.valueStart,`the start of the quoted value`);l.push({start:c,end:e(t.valueEnd,`the end of the quoted value`),text:i}),u.push({line:s(o,c),from:`${n}="${t.value}"`,to:`${n}="${i}"`})}for(let[e,t]of Object.entries(a.addAttributes))v.includes(e)||_.push(` ${e}="${t}"`);_.length>0&&l.push({start:n,end:n,text:_.join(``)}),(p||_.length>0)&&u.push({line:m,from:`<${a.from}`,to:`<${a.to}${_.join(``)}`}),p&&l.push({start:n-a.from.length,end:n,text:a.to});let y=a.attributeToContent===void 0?void 0:g.find(e=>e.name===a.attributeToContent);if(y===void 0)continue;if(y.kind!==`quoted`){d.push({file:c,line:m,path:`<${a.from}> ${y.name}`,message:`${y.name} must hold a value that becomes the element content; set it by hand`});continue}if(l.push({start:y.wsStart,end:y.attrEnd,text:``}),u.push({line:m,from:`${y.name}="${y.value}"`,to:`element content`}),h){let e=r.lastIndexOf(`/`,i);for(;/\s/.test(r[e-1]??``);)e--;l.push({start:e,end:i+1,text:`>${y.value}</${a.to}>`});continue}let b=r.indexOf(`</${a.from}`,i+1);if(b===-1)throw Error(`no closing </${a.from}> for the element at ${c}:${m}`);r.slice(i+1,b).trim()===``?l.push({start:i+1,end:b,text:e(y.value,`the value of the moved attribute`)}):(d.push({file:c,line:m,path:`<${a.from}> ${y.name}`,message:`the element already has content; move ${y.name} into it by hand`}),l.pop(),u.pop())}if(p)for(let e of r.matchAll(RegExp(`</${i(a.from)}(?=\\s*>)`,`g`))){let t=e.index+2;l.push({start:t,end:t+a.from.length,text:a.to}),u.push({line:s(o,t),from:`</${a.from}`,to:`</${a.to}`})}return{edits:l,hits:u,findings:d}}function u(e,t,n){let{edits:r,hits:i,findings:a}=l(e,n,o(e),t);r.sort((e,t)=>t.start-e.start||t.end-e.end);let s=e;for(let e of r)s=s.slice(0,e.start)+e.text+s.slice(e.end);return{text:s,hits:i,findings:a}}function d(e,t,n){if(n.length===0||!r.has(a(t)))return{text:e,hits:[],findings:[]};let i=e,o=[],s=[];for(let e of n){let n=u(i,t,e);i=n.text,o.push(...n.hits),s.push(...n.findings)}return o.sort((e,t)=>e.line-t.line||c(e.from,t.from)),s.sort((e,t)=>e.line-t.line||c(e.path,t.path)),{text:i,hits:o,findings:s}}export{d as applyRazorTags};
@@ -1,2 +1,2 @@
1
- import{present as e}from"../present.js";import{findQuoteEnd as t,tagOccurrences as n}from"./tagScan.js";import{applyEdits as r}from"./themeReads.js";import{separatorAt as i}from"./valueSplits.js";var a=new Set([`.cshtml`,`.razor`]),o=/(\s*)([^\s=/>"']+)(\s*=\s*)?/y,s=e=>{let t=/\.[^./]*$/.exec(e);return t?t[0].toLowerCase():``},c=(e,t)=>e.slice(0,t).split(`
2
- `).length;function l(n,r,i){let a=[],s=r;for(;;){o.lastIndex=s;let r=o.exec(n);if(r===null)break;let c=e(r[2],`the attribute name`),l=r.index+e(r[1],`the whitespace before an attribute`).length,u={name:c,nameStart:l,nameEnd:l+c.length,wsStart:r.index,kind:`none`,attrEnd:l+c.length},d=r.index+r[0].length;if(r[3]!==void 0&&(n[d]===`"`||n[d]===`'`)){let e=t(n,d);if(e===-1)break;u.kind=`quoted`,u.value=n.slice(d+1,e),u.attrEnd=e+1}else if(r[3]!==void 0){u.kind=`bare`;let e=/[^\s"'>]*/y.exec(n.slice(d));if(e===null)throw Error(`webority-tokens: bare attribute value is missing.`);u.attrEnd=d+e[0].length}if(u.attrEnd>i)break;a.push(u),s=u.attrEnd}return a}function u(t,o,u){if(u.length===0||!a.has(s(o)))return{text:t,hits:[],findings:[]};let d=[],f=[],p=[];for(let r of u)for(let a of r.tags)for(let{nameEnd:s,end:u}of n(t,a)){if(u===-1){p.push({file:o,line:c(t,s),path:`<${a}>`,message:`the tag could not be read (a quote in an attribute value does not pair up); set it by hand`});continue}let n=l(t,s,u),m=new Set(n.map(e=>e.name));for(let s of n){if(s.name!==r.attribute)continue;let n=c(t,s.nameStart),l=`<${a}> ${r.attribute}`,u=s.kind===`none`?`true`:s.kind===`quoted`&&s.value!==void 0?s.value.toLowerCase():void 0;if(u!==void 0&&!Object.hasOwn(r.values,u)&&r.keep?.includes(u))continue;if(u===void 0||!Object.hasOwn(r.values,u)){p.push({file:o,line:n,path:l,message:r.flag});continue}let h=Object.entries(e(r.values[u],`the table's values for the attribute`)).filter(([,e])=>e!==null),g=h.map(([e])=>e).filter(e=>e!==r.attribute&&m.has(e));if(g.length>0){p.push({file:o,line:n,path:l,message:`<${a}> already sets ${g.join(` and `)}; merge ${r.attribute} into it by hand`});continue}let _=h.map(([e,t])=>`${e}="${t}"`).join(i(t,s.nameStart));if(r.skipWritten&&_===t.slice(s.nameStart,s.attrEnd))continue;let v=h.length===0?s.wsStart:s.nameStart;d.push({start:v,end:s.attrEnd,text:_}),f.push({line:n,from:t.slice(s.nameStart,s.attrEnd),to:_.replace(/\n\s*/g,` `)})}}return f.sort((e,t)=>e.line-t.line||(e.from<t.from?-1:+(e.from>t.from))),p.sort((e,t)=>e.line-t.line||(e.path<t.path?-1:+(e.path>t.path))),{text:r(t,d,o),hits:f,findings:p}}export{u as applyRazorValueSplits};
1
+ import{present as e}from"../present.js";import{readRazorAttributes as t,tagOccurrences as n}from"./tagScan.js";import{applyEdits as r}from"./themeReads.js";import{separatorAt as i}from"./valueSplits.js";var a=new Set([`.cshtml`,`.razor`]),o=e=>{let t=/\.[^./]*$/.exec(e);return t?t[0].toLowerCase():``},s=(e,t)=>e.slice(0,t).split(`
2
+ `).length;function c(c,l,u){if(u.length===0||!a.has(o(l)))return{text:c,hits:[],findings:[]};let d=[],f=[],p=[];for(let r of u)for(let a of r.tags)for(let{nameEnd:o,end:u}of n(c,a)){if(u===-1){p.push({file:l,line:s(c,o),path:`<${a}>`,message:`the tag could not be read (a quote in an attribute value does not pair up); set it by hand`});continue}let n=t(c,o,u),m=new Set(n.map(e=>e.name));for(let t of n){if(t.name!==r.attribute)continue;let n=s(c,t.nameStart),o=`<${a}> ${r.attribute}`,u=t.kind===`none`?`true`:t.kind===`quoted`&&t.value!==void 0?t.value.toLowerCase():void 0;if(u!==void 0&&!Object.hasOwn(r.values,u)&&r.keep?.includes(u))continue;if(u===void 0||!Object.hasOwn(r.values,u)){p.push({file:l,line:n,path:o,message:r.flag});continue}let h=Object.entries(e(r.values[u],`the table's values for the attribute`)).filter(([,e])=>e!==null),g=h.map(([e])=>e).filter(e=>e!==r.attribute&&m.has(e));if(g.length>0){p.push({file:l,line:n,path:o,message:`<${a}> already sets ${g.join(` and `)}; merge ${r.attribute} into it by hand`});continue}let _=t.escaped?`\\"`:`"`,v=h.map(([e,t])=>`${e}=${_}${t}${_}`).join(i(c,t.nameStart));if(r.skipWritten&&v===c.slice(t.nameStart,t.attrEnd))continue;let y=h.length===0?t.wsStart:t.nameStart;d.push({start:y,end:t.attrEnd,text:v}),f.push({line:n,from:c.slice(t.nameStart,t.attrEnd),to:v.replace(/\n\s*/g,` `)})}}return f.sort((e,t)=>e.line-t.line||(e.from<t.from?-1:+(e.from>t.from))),p.sort((e,t)=>e.line-t.line||(e.path<t.path?-1:+(e.path>t.path))),{text:r(c,d,l),hits:f,findings:p}}export{c as applyRazorValueSplits};
@@ -1,3 +1,5 @@
1
+ export declare function skipQuoted(source: string, from: number, quote: string): number;
2
+ export declare function skipVerbatim(source: string, from: number): number;
1
3
  export declare function findQuoteEnd(source: string, from: number): number;
2
4
  export declare function findTagEnd(source: string, from: number): number;
3
5
  export type TagOccurrence = {
@@ -5,3 +7,18 @@ export type TagOccurrence = {
5
7
  end: number;
6
8
  };
7
9
  export declare function tagOccurrences(source: string, tag: string): TagOccurrence[];
10
+ export type Attr = {
11
+ name: string;
12
+ nameStart: number;
13
+ nameEnd: number;
14
+ wsStart: number;
15
+ attrEnd: number;
16
+ kind: "none" | "quoted" | "bare";
17
+ /** The value sits between backslash-escaped quotes (`\"`), as in markup inside a C# string; a writer must quote the same way. */
18
+ escaped: boolean;
19
+ value: string;
20
+ valueStart: number;
21
+ valueEnd: number;
22
+ };
23
+ /** The attributes between a tag's name and its end; a quoted value is read whole, a bare attribute keeps its unquoted text. */
24
+ export declare function readRazorAttributes(source: string, from: number, end: number): Attr[];
@@ -1 +1 @@
1
- var e=e=>e!==void 0&&/[\p{L}\p{Nd}_.]/u.test(e);function t(e,t,n){for(let r=t+1;r<e.length;r++)if(e[r]===`\\`)r++;else if(e[r]===n)return r+1;return-1}function n(e,t){for(let n=t+2;n<e.length;n++)if(e[n]===`"`){if(e[n+1]===`"`)n++;else return n+1}return-1}function r(e,r){let i=0,a=r;for(;a<e.length;){let r=e[a];if(r===`@`&&e[a+1]===`"`)a=n(e,a);else if(r===`"`||r===`'`)a=t(e,a,r);else{if(a++,r===`(`||r===`[`)i++;else if((r===`)`||r===`]`)&&(i--,i===0))return a;continue}if(a===-1)return-1}return-1}function i(t,n){let i=n+1;for(;;){for(;i<t.length&&e(t[i]);)i++;let n=t[i];if(n!==`(`&&n!==`[`)return i;if(i=r(t,i),i===-1)return-1;let a=t[i];if(a!==`.`&&a!==`(`&&a!==`[`)return i}}function a(e,t){let n=e[t],r=t+1;for(;r<e.length;){let t=e[r];if(t===`@`&&e[r+1]===`@`)r+=2;else if(t===`@`){if(r=i(e,r),r===-1)return-1}else if(t===n)return r;else r++}return-1}function o(e,t){let n=t;for(;n<e.length;){let t=e[n];if(t===`"`||t===`'`){if(n=a(e,n),n===-1)return-1}else if(t===`>`)return n;n++}return-1}function s(e,t){let n=`<${t}`,r=[];for(let t=e.indexOf(n);t!==-1;t=e.indexOf(n,t+1)){let i=t+n.length;/[\s/>]/.test(e[i]??``)&&r.push({nameEnd:i,end:o(e,i)})}return r}export{a as findQuoteEnd,o as findTagEnd,s as tagOccurrences};
1
+ import{present as e}from"../present.js";var t=e=>e!==void 0&&/[\p{L}\p{Nd}_.]/u.test(e);function n(e,t,n){for(let r=t+1;r<e.length;r++)if(e[r]===`\\`)r++;else if(e[r]===n)return r+1;return-1}function r(e,t){for(let n=t+2;n<e.length;n++)if(e[n]===`"`){if(e[n+1]===`"`)n++;else return n+1}return-1}function i(e,t){let i=0,a=t;for(;a<e.length;){let t=e[a];if(t===`@`&&e[a+1]===`"`)a=r(e,a);else if(t===`"`||t===`'`)a=n(e,a,t);else{if(a++,t===`(`||t===`[`)i++;else if((t===`)`||t===`]`)&&(i--,i===0))return a;continue}if(a===-1)return-1}return-1}function a(e,n){let r=n+1;for(;;){for(;r<e.length&&t(e[r]);)r++;let n=e[r];if(n!==`(`&&n!==`[`)return r;if(r=i(e,r),r===-1)return-1;let a=e[r];if(a!==`.`&&a!==`(`&&a!==`[`)return r}}function o(e,t){let n=e[t]===`\\`,r=n?`"`:e[t],i=t+(n?2:1);for(;i<e.length;){let t=e[i];if(t===`@`&&e[i+1]===`@`)i+=2;else if(t===`@`){if(i=a(e,i),i===-1)return-1}else if(n&&t===`\\`&&e[i+1]===r)return i+1;else if(!n&&t===r)return i;else i++}return-1}function s(e,t){let n=t;for(;n<e.length;){let t=e[n];if(t===`"`||t===`'`||t===`\\`&&e[n+1]===`"`){if(n=o(e,n),n===-1)return-1}else if(t===`>`)return n;n++}return-1}function c(e,t){let n=`<${t}`,r=[];for(let t=e.indexOf(n);t!==-1;t=e.indexOf(n,t+1)){let i=t+n.length;/[\s/>]/.test(e[i]??``)&&r.push({nameEnd:i,end:s(e,i)})}return r}var l=/(\s*)([^\s=/>"']+)(\s*=\s*)?/y,u=/[^\s"'>]*/y,d=(e,t)=>e[t]===`"`||e[t]===`'`||e[t]===`\\`&&e[t+1]===`"`;function f(t,n,r){let i=[],a=n;for(;;){l.lastIndex=a;let n=l.exec(t);if(n===null)break;let s=e(n[2],`the attribute name`),c=n.index+e(n[1],`the whitespace before an attribute`).length,f=n.index+n[0].length,p={name:s,nameStart:c,nameEnd:c+s.length,wsStart:n.index,attrEnd:c+s.length,kind:`none`,escaped:!1,value:``,valueStart:f,valueEnd:f};if(n[3]!==void 0&&d(t,f)){let e=o(t,f);if(e===-1)break;let n=t[f]===`\\`;p.kind=`quoted`,p.escaped=n,p.valueStart=f+(n?2:1),p.valueEnd=e-+!!n,p.value=t.slice(p.valueStart,p.valueEnd),p.attrEnd=e+1}else if(n[3]!==void 0){u.lastIndex=f;let n=e(u.exec(t)?.[0],`a bare attribute value`);p.kind=`bare`,p.value=n,p.valueEnd=f+n.length,p.attrEnd=p.valueEnd}if(p.attrEnd>r)break;i.push(p),a=p.attrEnd}return i}export{o as findQuoteEnd,s as findTagEnd,f as readRazorAttributes,n as skipQuoted,r as skipVerbatim,c as tagOccurrences};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webority/tokens",
3
- "version": "0.156.0",
3
+ "version": "0.158.0",
4
4
  "description": "The Webority design tokens in one W3C Design Tokens source (palette, scale, meaning and component tiers, with light and dark, web and phone, and 390 and 1440 widths), and the webority command that brands a product, upgrades it between releases and checks it against the token source.",
5
5
  "license": "SEE LICENSE IN LICENSE",
6
6
  "type": "module",
@@ -41,7 +41,7 @@
41
41
  "devDependencies": {
42
42
  "@babel/types": "7.29.8",
43
43
  "@types/node": "25.6.0",
44
- "@webority/biome-config": "0.156.0",
44
+ "@webority/biome-config": "0.158.0",
45
45
  "ajv": "8.20.0",
46
46
  "typescript": "^7.0.2",
47
47
  "vite": "^8.3.6"