@uiscore/cli 0.1.6 → 0.1.7

package/dist/index.js

@@ -82,6 +82,7 @@ function devDependencyInstallArgs(packageManager, dependencies) {
 }
 
 // src/commands/add.ts
+var UISCORE_FONT_IMPORT = '@import url("https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:wght@500;600;700&display=swap");';
 async function runAddCommand(options) {
   const config = loadConfig(options.cwd);
   const url = config.registryUrl.replace("{name}", options.name);
@@ -147,19 +148,30 @@ function writeCssVars({
   const markerEnd = "/* uiscore:tokens:end */";
   const nextBlock = buildCssVarBlock(cssVars, markerStart, markerEnd);
   if (!existing) {
-    writeFileSync(outputPath, nextBlock, "utf8");
+    writeFileSync(outputPath, `${UISCORE_FONT_IMPORT}
+
+${nextBlock}`, "utf8");
     return;
   }
-  if (existing.includes(markerStart) && existing.includes(markerEnd)) {
-    const updated = existing.replace(
+  const withFontImport = existing.includes(UISCORE_FONT_IMPORT) ? existing : `${UISCORE_FONT_IMPORT}
+
+${existing.trimStart()}`;
+  if (withFontImport.includes(markerStart) && withFontImport.includes(markerEnd)) {
+    const existingCssVars = parseCssVarsFromBlock(withFontImport, markerStart, markerEnd);
+    const mergedCssVars = {
+      ...existingCssVars,
+      ...cssVars
+    };
+    const mergedBlock = buildCssVarBlock(mergedCssVars, markerStart, markerEnd);
+    const updated = withFontImport.replace(
       new RegExp(`${escapeForRegExp(markerStart)}[\\s\\S]*?${escapeForRegExp(markerEnd)}`),
-      nextBlock.trimEnd()
+      mergedBlock.trimEnd()
     );
     writeFileSync(outputPath, `${updated.trimEnd()}
 `, "utf8");
     return;
   }
-  writeFileSync(outputPath, `${existing.trimEnd()}
+  writeFileSync(outputPath, `${withFontImport.trimEnd()}
 
 ${nextBlock}`, "utf8");
 }
@@ -172,6 +184,22 @@ ${vars}
 ${markerEnd}
 `;
 }
+function parseCssVarsFromBlock(source, markerStart, markerEnd) {
+  const blockMatch = source.match(
+    new RegExp(
+      `${escapeForRegExp(markerStart)}([\\s\\S]*?)${escapeForRegExp(markerEnd)}`
+    )
+  );
+  if (!blockMatch) {
+    return {};
+  }
+  const cssVars = {};
+  const matches = blockMatch[1].matchAll(/--([a-z0-9-]+)\s*:\s*([^;]+);/gi);
+  for (const match of matches) {
+    cssVars[match[1]] = match[2].trim();
+  }
+  return cssVars;
+}
 function escapeForRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uiscore/cli",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "CLI for installing UIScore registry components into projects.",
   "type": "module",
   "bin": {