tokenami 0.0.81 → 0.0.82

package/dist/index.js

@@ -17,8 +17,7 @@ var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
+  if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 var __esm = (fn, res) => function __init() {
@@ -45,7 +44,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var getFilename, getDirname, __dirname, __filename;
 var init_esm_shims = __esm({
-  "../../node_modules/.pnpm/tsup@7.3.0_typescript@5.4.5/node_modules/tsup/assets/esm_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.4.0_jiti@1.21.6_typescript@5.4.5/node_modules/tsup/assets/esm_shims.js"() {
     getFilename = () => fileURLToPath(import.meta.url);
     getDirname = () => path.dirname(getFilename());
     __dirname = /* @__PURE__ */ getDirname();
@@ -244,8 +243,7 @@ var require_HashArray = __commonJS({
                 continue;
               }
               this._map[inst].push(obj);
-            } else
-              this._map[inst] = [obj];
+            } else this._map[inst] = [obj];
           }
         }
         if (!needsDupCheck || this._list.indexOf(obj) == -1)
@@ -334,8 +332,7 @@ var require_HashArray = __commonJS({
         count = Math.min(Math.max(max - min, 1), count);
         while (res.length < count) {
           var r = Math.floor(min + Math.random() * (max + 1));
-          if (map[r])
-            continue;
+          if (map[r]) continue;
           map[r] = true;
           res.push(r);
         }
@@ -608,8 +605,7 @@ var require_crypt = __commonJS({
         base64ToBytes: function(base64) {
           base64 = base64.replace(/[^A-Z0-9+\/]/ig, "");
           for (var bytes = [], i = 0, imod4 = 0; i < base64.length; imod4 = ++i % 4) {
-            if (imod4 == 0)
-              continue;
+            if (imod4 == 0) continue;
             bytes.push((base64map.indexOf(base64.charAt(i - 1)) & Math.pow(2, -2 * imod4 + 8) - 1) << imod4 * 2 | base64map.indexOf(base64.charAt(i)) >>> 6 - imod4 * 2);
           }
           return bytes;
@@ -858,16 +854,14 @@ var require_TrieSearch = __commonJS({
     }
     TrieSearch2.prototype = {
       add: function(item, customKeys) {
-        if (this.options.cache)
-          this.clearCache();
+        if (this.options.cache) this.clearCache();
         if (typeof customKeys === "number") {
           customKeys = void 0;
         }
         var keyFields = customKeys || this.keyFields;
         for (var k in keyFields) {
           var key = keyFields[k], isKeyArr = key instanceof Array, val = isKeyArr ? deepLookup(item, key) : item[key];
-          if (!val)
-            continue;
+          if (!val) continue;
           val = val.toString();
           if (this.options.ignoreCase) {
             val = val.toLowerCase();
@@ -887,14 +881,12 @@ var require_TrieSearch = __commonJS({
        * @param keyFields The keyfields in which to search for this phrase to remove
        */
       remove: function(phrase, keyFields) {
-        if (!phrase)
-          return;
+        if (!phrase) return;
         phrase = phrase.toString();
         phrase = this.options.ignoreCase ? phrase.toLowerCase() : phrase;
         keyFields = keyFields || this.keyFields;
         keyFields = keyFields instanceof Array ? keyFields : [keyFields];
-        if (this.options.cache)
-          this.clearCache();
+        if (this.options.cache) this.clearCache();
         var diacriticalVariants = this.expandString(phrase);
         for (var variant of diacriticalVariants) {
           var words = this.options.splitOnRegEx ? variant.split(this.options.splitOnRegEx) : [variant];
@@ -1046,17 +1038,14 @@ var require_TrieSearch = __commonJS({
             return [];
           keyArr = [key.substring(0, this.options.min)];
           keyArr = keyArr.concat(key.substring(this.options.min).split(""));
-        } else
-          keyArr = key.split("");
+        } else keyArr = key.split("");
         return keyArr;
       },
       findNode: function(key) {
         return f(this.keyToArr(key), this.root);
         function f(keyArr, node) {
-          if (!node)
-            return void 0;
-          if (keyArr.length === 0)
-            return node;
+          if (!node) return void 0;
+          if (keyArr.length === 0) return node;
           var k = keyArr.shift();
           return f(keyArr, node[k]);
         }
@@ -1093,8 +1082,7 @@ var require_TrieSearch = __commonJS({
               var item = node2.value[i];
               if (!limit || all.length < limit) {
                 const id = self.getId(item);
-                if (dedupDict[id])
-                  continue;
+                if (dedupDict[id]) continue;
                 all.push(item);
                 dedupDict[id] = item;
               }
@@ -1128,8 +1116,7 @@ var require_TrieSearch = __commonJS({
         return this.get(phrases, reducer, limit);
       },
       getId: function(item, customKeys) {
-        if (item.$tsid)
-          return item.$tsid;
+        if (item.$tsid) return item.$tsid;
         if (!this.options.idFieldOrFunction) {
           var s = "";
           var kf = customKeys || this.keyFields;
@@ -1203,8 +1190,7 @@ var TokenamiDiagnostics = class {
       const processNode = this.#processNode.bind(this);
       ts.forEachChild(sourceFile, function nextNode(node) {
         const nodeDiagnostics = processNode(node, sourceFile);
-        if (nodeDiagnostics)
-          diagnostics.push(...nodeDiagnostics);
+        if (nodeDiagnostics) diagnostics.push(...nodeDiagnostics);
         ts.forEachChild(node, nextNode);
       });
     }
@@ -1212,16 +1198,14 @@ var TokenamiDiagnostics = class {
   }
   #processNode(node, sourceFile) {
     const isDiagnosticPrevented = this.#shouldSuppressDiagnosticForNode(node, sourceFile);
-    if (isDiagnosticPrevented)
-      return;
+    if (isDiagnosticPrevented) return;
     if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.expression) && node.expression.expression.text === "css" && node.expression.name.text === "compose" && node.arguments[0] && ts.isObjectLiteralExpression(node.arguments[0])) {
       return this.#validateComposeConfig(node.arguments[0], sourceFile);
     }
     if (ts.isPropertyAssignment(node)) {
       const nodeProperty = ts.isStringLiteral(node.name) ? node.name.text : null;
       const property = TokenamiConfig4.TokenProperty.safeParse(nodeProperty);
-      if (!property.success)
-        return;
+      if (!property.success) return;
       return this.#validateTokenamiProperty(property.output, node, sourceFile);
     }
   }
@@ -1229,8 +1213,7 @@ var TokenamiDiagnostics = class {
     const { variants } = TokenamiConfig4.getTokenPropertySplit(property);
     const parts = TokenamiConfig4.getTokenPropertyParts(property, this.#config);
     const isArbitrarySelector = variants.some(TokenamiConfig4.getArbitrarySelector);
-    if (!variants.length || parts || isArbitrarySelector)
-      return;
+    if (!variants.length || parts || isArbitrarySelector) return;
     const selector = variants.join("_");
     const isEmptyArbSelector = variants.includes("{}");
     const arbSuffix = isEmptyArbSelector ? ` Add an arbitrary selector or remove '${selector}'.` : "";
@@ -1258,8 +1241,7 @@ var TokenamiDiagnostics = class {
         const length = prop.getWidth(sourceFile);
         return [{ ...diagnostic, start, length }];
       }
-      if (!ts.isPropertyAssignment(prop))
-        continue;
+      if (!ts.isPropertyAssignment(prop)) continue;
       const key = prop.name;
       const value = prop.initializer;
       if (ts.isComputedPropertyName(key)) {
@@ -1277,8 +1259,7 @@ var TokenamiDiagnostics = class {
     }
   }
   #shouldSuppressDiagnosticForNode(node, sourceFile) {
-    if (!sourceFile)
-      return false;
+    if (!sourceFile) return false;
     const lineStarts = sourceFile.getLineStarts();
     const nodeStartPos = node.getStart(sourceFile);
     const nodeStartLine = sourceFile.getLineAndCharacterOfPosition(nodeStartPos).line;
@@ -1790,14 +1771,13 @@ var DEFAULT_PATHS = {
   mjs: "./.tokenami/tokenami.config.mjs"
 };
 function getConfigPath(cwd, path2, type) {
-  path2 = path2 || getConfigDefaultPath(cwd, type);
+  path2 = path2 || getConfigDefaultPath(cwd);
   return pathe.join(cwd, path2);
 }
 function getConfigAtPath(path2, opts = { cache: true }) {
   const config = (() => {
     try {
-      if (!opts.cache)
-        delete __require.cache[__require.resolve(path2)];
+      if (!opts.cache) delete __require.cache[__require.resolve(path2)];
       return __require(path2);
     } catch {
       return lazyJiti({ cache: opts.cache })(path2);
@@ -1809,7 +1789,7 @@ function getConfigDefaultPath(cwd, type) {
   const existingConfig = Object.values(DEFAULT_PATHS).find((path2) => {
     return fs.existsSync(pathe.join(cwd, path2));
   });
-  return existingConfig || DEFAULT_PATHS[type || "js"];
+  return existingConfig || DEFAULT_PATHS["js"];
 }
 function getTypeDefsPath(configPath) {
   const dirname2 = pathe.dirname(configPath);
@@ -1974,10 +1954,8 @@ var TrieCompletions = class {
   variantSearch(search) {
     const input = this.#createTrieInput(search);
     const parts = TokenamiConfig4.getTokenPropertySplit(search);
-    if (!parts.variants.length)
-      return this.#selectorSnippets.search(input);
-    if (parts.variants.length > 1)
-      return this.#responsiveSelectorsSearch(input, parts.variants);
+    if (!parts.variants.length) return this.#selectorSnippets.search(input);
+    if (parts.variants.length > 1) return this.#responsiveSelectorsSearch(input, parts.variants);
     const selectors = this.#selectorsSearch(input, parts.variants);
     const snippets = this.#responsiveSelectorSnippets.search(input);
     return [...selectors, ...snippets];
@@ -1994,8 +1972,7 @@ var TrieCompletions = class {
   }
   #selectorsSearch(input, variants) {
     const [_, arbSelector] = input.match(/\{(.*)\}/) ?? [];
-    if (!arbSelector)
-      return this.#selectors.search(input);
+    if (!arbSelector) return this.#selectors.search(input);
     const key = String(variants);
     this.#arbSelectors[key] ??= this.#createCompletionEntriesTrie(
       this.#getSelectorCompletions(arbSelector)
@@ -2004,8 +1981,7 @@ var TrieCompletions = class {
   }
   #responsiveSelectorsSearch(input, variants) {
     const [_, arbSelector] = input.match(/\{(.*)\}/) ?? [];
-    if (!arbSelector)
-      return this.#responsiveSelectors.search(input);
+    if (!arbSelector) return this.#responsiveSelectors.search(input);
     const key = String(variants);
     this.#arbResponsiveSelectors[key] ??= this.#createCompletionEntriesTrie(
       this.#getResponsiveSelectorCompletions(arbSelector)
@@ -2153,8 +2129,7 @@ var TokenamiPlugin = class {
   }
   #watchConfig(configPath) {
     this.#ctx.ts.sys.watchFile?.(configPath, (_fileName, eventKind) => {
-      if (eventKind !== this.#ctx.ts.FileWatcherEventKind.Changed)
-        return;
+      if (eventKind !== this.#ctx.ts.FileWatcherEventKind.Changed) return;
       try {
         const reloadedConfig = getConfigAtPath(configPath, { cache: false });
         updateEnvFile(configPath, reloadedConfig);
@@ -2173,8 +2148,7 @@ var TokenamiPlugin = class {
   getSemanticDiagnostics(fileName) {
     const original = this.#ctx.info.languageService.getSemanticDiagnostics(fileName);
     const sourceFile = this.#ctx.info.languageService.getProgram()?.getSourceFile(fileName);
-    if (!sourceFile)
-      return original;
+    if (!sourceFile) return original;
     return [...this.#diagnostics.getSemanticDiagnostics(sourceFile), ...original];
   }
   getCompletionsAtPosition = (fileName, position, options) => {
@@ -2185,8 +2159,7 @@ var TokenamiPlugin = class {
     );
     const program = this.#ctx.info.languageService.getProgram();
     const sourceFile = program?.getSourceFile(fileName);
-    if (!original || !sourceFile)
-      return original;
+    if (!original || !sourceFile) return original;
     const isTokenPropertyEntries = original.entries.some(
       (entry) => TokenamiConfig4.TokenProperty.safeParse(entry.name).success
     );
@@ -2194,8 +2167,7 @@ var TokenamiPlugin = class {
       (entry) => TokenamiConfig4.TokenValue.safeParse(entry.name).success
     );
     const node = findNodeAtPosition(sourceFile, position);
-    if (!node)
-      return original;
+    if (!node) return original;
     if (isTokenValueEntries) {
       const input = getValueAtPosition(node, position);
       const needsQuotes = !input.startsWith('"') && !input.startsWith("'");
@@ -2234,22 +2206,17 @@ var TokenamiPlugin = class {
       return entry2 ? createEntryDetails(original, entry2, String(entry2.details.selector)) : original;
     }
     const sourceFile = this.#ctx.info.languageService.getProgram()?.getSourceFile(fileName);
-    if (!sourceFile)
-      return original;
+    if (!sourceFile) return original;
     const node = findNodeAtPosition(sourceFile, position);
-    if (!node || !ts.isPropertyAssignment(node.parent))
-      return original;
+    if (!node || !ts.isPropertyAssignment(node.parent)) return original;
     const parentProperty = node.parent.name.getText();
     const isTokenamiValue = TokenamiConfig4.TokenProperty.safeParse(parentProperty).success;
-    if (!isTokenamiValue)
-      return original;
+    if (!isTokenamiValue) return original;
     const [entry] = this.#completions.valueSearch(search);
-    if (!entry)
-      return original;
+    if (!entry) return original;
     const themeEntries = Object.entries(entry.details.modeValues);
     const [mode, firstValue] = themeEntries[0] || [];
-    if (!firstValue)
-      return original;
+    if (!firstValue) return original;
     if (isColorThemeEntry(entry.details.modeValues)) {
       const colorDescription = createColorTokenDescription(entry.details.modeValues);
       const rgb2 = convertToRgb(replaceCssVarsWithFallback(firstValue), mode);
@@ -2264,22 +2231,18 @@ ${colorDescription}`);
   getQuickInfoAtPosition(fileName, position) {
     const original = this.#ctx.info.languageService.getQuickInfoAtPosition(fileName, position);
     const sourceFile = this.#ctx.info.languageService.getProgram()?.getSourceFile(fileName);
-    if (!original || !sourceFile)
-      return original;
+    if (!original || !sourceFile) return original;
     const node = findNodeAtPosition(sourceFile, position);
-    if (!node || !node.parent || !ts.isPropertyAssignment(node.parent))
-      return original;
+    if (!node || !node.parent || !ts.isPropertyAssignment(node.parent)) return original;
     const property = node.parent;
     const propertyName = property.name.getText(sourceFile);
     const propertyValue = property.initializer.getText();
     const tokenProperty3 = TokenamiConfig4.TokenProperty.safeParse(propertyName);
     const tokenValue2 = TokenamiConfig4.TokenValue.safeParse(propertyValue);
-    if (!tokenProperty3.success || !tokenValue2.success)
-      return original;
+    if (!tokenProperty3.success || !tokenValue2.success) return original;
     const { variants } = TokenamiConfig4.getTokenPropertySplit(tokenProperty3.output);
     const propertyParts = TokenamiConfig4.getTokenPropertyParts(tokenProperty3.output, this.#config);
-    if (!propertyParts && variants.length)
-      return;
+    if (!propertyParts && variants.length) return;
     const modeValues = getThemeValuesByThemeMode(tokenValue2.output, this.#config.theme);
     const text = isColorThemeEntry(modeValues) ? createColorTokenDescription(modeValues) : createTokenDescription(modeValues);
     return { ...original, documentation: [{ text, kind: "markdown" }] };
@@ -2294,16 +2257,13 @@ ${colorDescription}`);
       preferences
     );
     const sourceFile = this.#ctx.info.languageService.getProgram()?.getSourceFile(fileName);
-    if (!sourceFile || !errorCodes.includes(INVALID_VALUE))
-      return original;
+    if (!sourceFile || !errorCodes.includes(INVALID_VALUE)) return original;
     const node = findNodeAtPosition(sourceFile, start);
-    if (!node?.parent || !ts.isPropertyAssignment(node.parent))
-      return original;
+    if (!node?.parent || !ts.isPropertyAssignment(node.parent)) return original;
     const assignment = node.parent;
     const valueSpan = createTextSpanFromNode(assignment.initializer);
     const value = ts.isStringLiteral(assignment.initializer) && assignment.initializer.text;
-    if (!value)
-      return original;
+    if (!value) return original;
     const quoteMark = assignment.initializer.getText().slice(-1);
     const arbitraryValue2 = TokenamiConfig4.arbitraryValue(value);
     const arbitraryText = `${quoteMark}${arbitraryValue2}${quoteMark}`;
@@ -2319,13 +2279,11 @@ ${colorDescription}`);
 function updateEnvFile(configPath, config) {
   const envFilePath = getTypeDefsPath(configPath);
   const envFileContent = ts.sys.readFile(envFilePath, "utf-8");
-  if (!envFileContent)
-    throw new Error("Cannot read tokenami.env.d.ts file");
+  if (!envFileContent) throw new Error("Cannot read tokenami.env.d.ts file");
   const properties = Object.keys(config.properties || {});
   const customProperties = Object.keys(config.customProperties || {});
   const experimentalProperties = properties.flatMap((property) => {
-    if (supportedProperties.has(property))
-      return [];
+    if (supportedProperties.has(property)) return [];
     return [property];
   });
   const customPropertyTypes = [...experimentalProperties, ...customProperties].map((property) => {
@@ -2371,8 +2329,7 @@ function getValueAtPosition(node, position) {
   let input = node.getText();
   if (ts.isObjectLiteralExpression(node)) {
     for (const property of node.properties) {
-      if (!ts.isPropertyAssignment(property))
-        continue;
+      if (!ts.isPropertyAssignment(property)) continue;
       const value = property.initializer;
       const start = value.getStart();
       const end = value.getEnd();
@@ -2409,8 +2366,7 @@ function convertToRgb(fill, mode) {
     const color = culori2.rgb(parsed);
     const modeColor = culori2.rgb(mode == "dark" ? "#000" : "#fff");
     const bgColor = fill === "transparent" ? void 0 : modeColor;
-    if (!color)
-      return fill;
+    if (!color) return fill;
     if (!bgColor || parsed?.alpha === void 0 || parsed.alpha === 1) {
       return culori2.formatRgb(color);
     }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "tokenami",
-  "version": "0.0.81",
+  "version": "0.0.82",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
-  "repository": "https://github.com/tokenami/tokenami",
+  "repository": "tokenami/tokenami",
   "publishConfig": {
     "access": "public"
   },
@@ -40,13 +40,13 @@
     "@types/culori": "^2.1.0",
     "@types/inquirer": "^9.0.7",
     "@types/node": "^20.3.1",
-    "tsup": "^7.0.0",
+    "tsup": "^8.4.0",
     "typescript": "^5.1.3"
   },
   "dependencies": {
     "@stitches/stringify": "^1.2.8",
-    "@tokenami/config": "0.0.81",
-    "@tokenami/ds": "0.0.81",
+    "@tokenami/config": "0.0.82",
+    "@tokenami/ds": "0.0.82",
     "acorn": "^8.11.3",
     "acorn-walk": "^8.3.2",
     "browserslist": "^4.24.4",
@@ -67,5 +67,5 @@
   "peerDependencies": {
     "typescript": ">= 5"
   },
-  "gitHead": "ebf9ebecf6d23586be19b859f7d243de7346f9f7"
+  "gitHead": "ba381af577865573615b630033e9fbd429d60bba"
 }