@dsai-io/tools 1.2.5 → 1.3.1

package/dist/index.d.cts

@@ -8,7 +8,7 @@ import { z } from 'zod';
 /**
  * Package version
  */
-declare const version = "0.0.1";
+declare const version = "1.3.0";
 
 /**
  * Registry type definitions for DSAi component distribution.

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import { z } from 'zod';
 /**
  * Package version
  */
-declare const version = "0.0.1";
+declare const version = "1.3.0";
 
 /**
  * Registry type definitions for DSAi component distribution.

package/dist/index.js

@@ -1157,6 +1157,85 @@ var init_groups = __esm({
   }
 });
 
+// src/tokens/style-dictionary/preprocessors/fix-references.ts
+function fixValue(value, mappings) {
+  if (typeof value !== "string" || !value.startsWith("{")) {
+    return value;
+  }
+  let result = value;
+  for (const mapping of mappings) {
+    result = result.split(mapping[0]).join(mapping[1]);
+  }
+  return result;
+}
+function processTokens(obj, mappings) {
+  for (const key of Object.keys(obj)) {
+    const value = obj[key];
+    if (value && typeof value === "object") {
+      const typedValue = value;
+      if ("$value" in typedValue) {
+        typedValue["$value"] = fixValue(typedValue["$value"], mappings);
+      } else if ("value" in typedValue) {
+        typedValue["value"] = fixValue(typedValue["value"], mappings);
+      } else {
+        processTokens(typedValue, mappings);
+      }
+    }
+  }
+}
+function createFixReferencesPreprocessor(mappings) {
+  return {
+    name: "fix-references-custom",
+    preprocessor: (dictionary) => {
+      processTokens(dictionary, mappings);
+      return dictionary;
+    }
+  };
+}
+var DEFAULT_PATH_MAPPINGS, fixReferences;
+var init_fix_references = __esm({
+  "src/tokens/style-dictionary/preprocessors/fix-references.ts"() {
+    DEFAULT_PATH_MAPPINGS = [
+      ["{colors.brand.", "{color."],
+      ["{colors.neutral.", "{neutral."],
+      ["{borders.width.", "{border.width."]
+    ];
+    fixReferences = {
+      name: "fix-references",
+      preprocessor: (dictionary) => {
+        processTokens(dictionary, DEFAULT_PATH_MAPPINGS);
+        return dictionary;
+      }
+    };
+  }
+});
+
+// src/tokens/style-dictionary/preprocessors/index.ts
+var preprocessors_exports = {};
+__export(preprocessors_exports, {
+  builtInPreprocessors: () => builtInPreprocessors,
+  createFixReferencesPreprocessor: () => createFixReferencesPreprocessor,
+  fixReferences: () => fixReferences,
+  registerPreprocessors: () => registerPreprocessors
+});
+function registerPreprocessors(sd, customPreprocessors = []) {
+  const allPreprocessors = [...builtInPreprocessors, ...customPreprocessors];
+  for (const preprocessor of allPreprocessors) {
+    sd.registerPreprocessor({
+      name: preprocessor.name,
+      preprocessor: preprocessor.preprocessor
+    });
+  }
+}
+var builtInPreprocessors;
+var init_preprocessors = __esm({
+  "src/tokens/style-dictionary/preprocessors/index.ts"() {
+    init_fix_references();
+    init_fix_references();
+    builtInPreprocessors = [fixReferences];
+  }
+});
+
 // src/tokens/diff.ts
 var diff_exports = {};
 __export(diff_exports, {
@@ -1456,7 +1535,7 @@ var init_optimizer = __esm({
 });
 
 // src/version.ts
-var version = "0.0.1";
+var version = "1.3.0";
 var logLevelSchema = z.enum(["silent", "error", "warn", "info", "debug", "verbose"]);
 var outputFormatSchema = z.enum(["css", "scss", "less", "json", "js", "ts", "esm", "cjs"]);
 var frameworkSchema = z.enum(["react", "vue", "angular", "svelte", "vanilla"]);
@@ -5993,7 +6072,7 @@ var FORMAT_MAPPING = /* @__PURE__ */ new Map([
   ["ios", { default: "ios/macros", themed: "ios/macros" }]
 ]);
 var TRANSFORM_GROUPS = /* @__PURE__ */ new Map([
-  ["css", "css"],
+  ["css", "custom/css"],
   ["scss", "scss"],
   ["js", "js-custom"],
   // Use custom transform group for valid JS identifiers
@@ -6010,7 +6089,13 @@ function generateThemeBuildConfig(options) {
   const platformsMap = /* @__PURE__ */ new Map();
   const enabledFormats = config.formats;
   for (const format of enabledFormats) {
-    const platformConfig = generatePlatformConfig(format, themeDefinition, outputDir, isDefault);
+    const platformConfig = generatePlatformConfig(
+      format,
+      themeDefinition,
+      outputDir,
+      isDefault,
+      config.prefix
+    );
     if (platformConfig) {
       platformsMap.set(format, platformConfig);
     }
@@ -6019,6 +6104,7 @@ function generateThemeBuildConfig(options) {
   return {
     source: files,
     platforms,
+    preprocessors: ["fix-references"],
     // Enable DTCG format support (tokens with $value, $type, etc.)
     usesDtcg: true,
     // Configure logging to not throw on broken references (they'll be logged but build continues)
@@ -6031,7 +6117,7 @@ function generateThemeBuildConfig(options) {
     }
   };
 }
-function generatePlatformConfig(format, themeDefinition, outputDir, isDefault) {
+function generatePlatformConfig(format, themeDefinition, outputDir, isDefault, prefix) {
   const formatConfig = FORMAT_MAPPING.get(format);
   if (!formatConfig) {
     console.warn(`Unknown format: ${format}`);
@@ -6046,8 +6132,15 @@ function generatePlatformConfig(format, themeDefinition, outputDir, isDefault) {
     destination: outputFile,
     format: sdFormat
   };
+  if (prefix && (format === "css" || format === "scss")) {
+    fileConfig.options = {
+      ...fileConfig.options,
+      prefix
+    };
+  }
   if (format === "css" && !isDefault) {
     fileConfig.options = {
+      ...fileConfig.options,
       selector: themeDefinition.selector
     };
   }
@@ -6160,6 +6253,8 @@ async function runStyleDictionaryBuild(sdConfig, options) {
   registerCustomTransforms(StyleDictionary);
   const { registerTransformGroups: registerTransformGroups2 } = await Promise.resolve().then(() => (init_groups(), groups_exports));
   registerTransformGroups2(StyleDictionary);
+  const { registerPreprocessors: registerPreprocessors2 } = await Promise.resolve().then(() => (init_preprocessors(), preprocessors_exports));
+  registerPreprocessors2(StyleDictionary);
   if (options.verbose) {
     console.warn(`   \u{1F527} Style Dictionary platforms:`);
     for (const [platform, config] of Object.entries(sdConfig.platforms)) {
@@ -6613,7 +6708,7 @@ var STEP_DISPLAY_NAMES = /* @__PURE__ */ new Map([
   ["sass-utilities-minified", "Compile DSAi Utilities (minified)"],
   ["bundle", "Bundle with tsup"]
 ]);
-function createStepFromName(stepName, tokensPackageDir, figmaExportsDir, tokensDir, paths, sdConfigFile, strict, snapshotService, themesConfig, outputDir, formats = ["css", "scss", "json"], cssOutputDir, postprocessConfig) {
+function createStepFromName(stepName, tokensPackageDir, figmaExportsDir, tokensDir, paths, sdConfigFile, strict, snapshotService, themesConfig, outputDir, formats = ["css", "scss", "json"], cssOutputDir, postprocessConfig, prefix) {
   const displayName = STEP_DISPLAY_NAMES.get(stepName) ?? `Unknown: ${stepName}`;
   switch (stepName) {
     case "validate":
@@ -6818,6 +6913,7 @@ function createStepFromName(stepName, tokensPackageDir, figmaExportsDir, tokensD
             const result = await buildAllThemes({
               config: {
                 formats,
+                prefix,
                 themes: {
                   definitions: themeDefinitions
                 }
@@ -6933,7 +7029,8 @@ function createBuildSteps(tokensDir, _toolsDir, options, pipeline) {
       options.outputDir,
       formats,
       options.cssOutputDir,
-      options.postprocessConfig
+      options.postprocessConfig,
+      options.prefix
     );
     if (stepName === "validate" && skipValidate) {
       step.skip = true;
@@ -8208,68 +8305,7 @@ function getSDTokenType(token) {
 // src/tokens/style-dictionary/config.ts
 init_formats();
 init_groups();
-
-// src/tokens/style-dictionary/preprocessors/fix-references.ts
-var DEFAULT_PATH_MAPPINGS = [
-  ["{colors.brand.", "{color."],
-  ["{colors.neutral.", "{neutral."],
-  ["{borders.width.", "{border.width."]
-];
-function fixValue(value, mappings) {
-  if (typeof value !== "string" || !value.startsWith("{")) {
-    return value;
-  }
-  let result = value;
-  for (const mapping of mappings) {
-    result = result.split(mapping[0]).join(mapping[1]);
-  }
-  return result;
-}
-function processTokens(obj, mappings) {
-  for (const key of Object.keys(obj)) {
-    const value = obj[key];
-    if (value && typeof value === "object") {
-      const typedValue = value;
-      if ("$value" in typedValue) {
-        typedValue["$value"] = fixValue(typedValue["$value"], mappings);
-      } else if ("value" in typedValue) {
-        typedValue["value"] = fixValue(typedValue["value"], mappings);
-      } else {
-        processTokens(typedValue, mappings);
-      }
-    }
-  }
-}
-var fixReferences = {
-  name: "fix-references",
-  preprocessor: (dictionary) => {
-    processTokens(dictionary, DEFAULT_PATH_MAPPINGS);
-    return dictionary;
-  }
-};
-function createFixReferencesPreprocessor(mappings) {
-  return {
-    name: "fix-references-custom",
-    preprocessor: (dictionary) => {
-      processTokens(dictionary, mappings);
-      return dictionary;
-    }
-  };
-}
-
-// src/tokens/style-dictionary/preprocessors/index.ts
-var builtInPreprocessors = [fixReferences];
-function registerPreprocessors(sd, customPreprocessors = []) {
-  const allPreprocessors = [...builtInPreprocessors, ...customPreprocessors];
-  for (const preprocessor of allPreprocessors) {
-    sd.registerPreprocessor({
-      name: preprocessor.name,
-      preprocessor: preprocessor.preprocessor
-    });
-  }
-}
-
-// src/tokens/style-dictionary/config.ts
+init_preprocessors();
 init_transforms();
 var DEFAULT_SOURCE_PATTERNS = [
   "collections/color/*.json",
@@ -8424,6 +8460,7 @@ function setupStyleDictionary(sd, dsaiConfig, options = {}) {
 // src/tokens/style-dictionary/index.ts
 init_transforms();
 init_formats();
+init_preprocessors();
 init_groups();
 
 // src/tokens/framework-mappers/index.ts
@@ -9808,7 +9845,7 @@ function analyzeImports(files, knownNpmDeps) {
     importPattern.lastIndex = 0;
     while ((m = importPattern.exec(file.content)) !== null) {
       const specifier = m[1] ?? "";
-      const typesPattern = /\.\.\/(?:\.\.\/)?types(?:\/.*)?$/;
+      const typesPattern = /^\.\.\/\.\.\/types(?:\/.*)?$/;
       if (typesPattern.test(specifier)) {
         registryDeps.add("dsai-types");
         continue;
@@ -9828,6 +9865,16 @@ function analyzeImports(files, knownNpmDeps) {
         if (regName) registryDeps.add(regName);
         continue;
       }
+      const siblingUtilPattern = /^\.\.\/([a-z][\w-]*)(?:\/.*)?$/;
+      const siblingUtilMatch = siblingUtilPattern.exec(specifier);
+      if (siblingUtilMatch && siblingUtilMatch[1]) {
+        const siblingDir = siblingUtilMatch[1];
+        const regName = UTIL_SUBPATH_TO_REGISTRY[siblingDir];
+        if (regName) {
+          registryDeps.add(regName);
+          continue;
+        }
+      }
       const compPattern = /^\.\.\/(\.\.\/)?(?:components\/)?([A-Z]\w+)(?:\/.*)?$/;
       const compMatch = compPattern.exec(specifier);
       if (compMatch && compMatch[2]) {
@@ -9971,6 +10018,8 @@ function buildTypesItem(reactSrcDir, log) {
   const files = sourceFiles.map((f) => {
     let content = f.content;
     content = content.replace(/export \{[^}]*\} from ['"]\.\.\/utils\/[^'"]+['"];?\n?/g, "");
+    content = content.replace(/export\s+(?!type)\{[^}]*\}\s+from\s+['"]\.\/[^'"]+['"];?\n?/g, "");
+    content = content.replace(/\/\*\*\s*\n\s*\*\s*@deprecated[^*]*\*\/\s*\n/g, "");
     return {
       path: `types/${f.path}`,
       type: "registry:type",
@@ -10147,7 +10196,7 @@ function transformImports(content, options) {
   const { aliases } = options;
   let result = content;
   result = result.replace(
-    /(from\s+['"])(?:\.\.\/)+types(?:\/([^'"]+))?(['"])/g,
+    /(from\s+['"])\.\.\/\.\.\/types(?:\/([^'"]+))?(['"])/g,
     (_match, prefix, subpath, suffix) => {
       if (subpath) {
         return `${prefix}${aliases.importAlias}${aliases.components}/types/${subpath}${suffix}`;
@@ -10155,6 +10204,18 @@ function transformImports(content, options) {
       return `${prefix}${aliases.importAlias}${aliases.components}/types${suffix}`;
     }
   );
+  result = result.replace(
+    /(from\s+['"])\.\.\/\.\.\/hooks\/(\w+)(['"])/g,
+    `$1${aliases.importAlias}${aliases.hooks}/$2$3`
+  );
+  result = result.replace(
+    /(from\s+['"])\.\.\/\.\.\/utils\/(\w+(?:\/\w+)?)(['"])/g,
+    `$1${aliases.importAlias}${aliases.utils}/$2$3`
+  );
+  result = result.replace(
+    /(from\s+['"])\.\.\/\.\.\/utils(['"])/g,
+    `$1${aliases.importAlias}${aliases.utils}$2`
+  );
   result = result.replace(
     /(from\s+['"])\.\.\/(([A-Z]\w+)(\/[^'"]+)?)(['"])/g,
     (_match, prefix, _fullPath, dirName, subPath, suffix) => {
@@ -10165,18 +10226,6 @@ function transformImports(content, options) {
       return `${prefix}${aliases.importAlias}${aliases.ui}/${kebab}${suffix}`;
     }
   );
-  result = result.replace(
-    /(from\s+['"])(?:\.\.\/)+hooks\/(\w+)(['"])/g,
-    `$1${aliases.importAlias}${aliases.hooks}/$2$3`
-  );
-  result = result.replace(
-    /(from\s+['"])(?:\.\.\/)+utils\/(\w+(?:\/\w+)?)(['"])/g,
-    `$1${aliases.importAlias}${aliases.utils}/$2$3`
-  );
-  result = result.replace(
-    /(from\s+['"])(?:\.\.\/)+utils(['"])/g,
-    `$1${aliases.importAlias}${aliases.utils}$2`
-  );
   return result;
 }
 function normalizeExtensions(content, tsx) {
@@ -10230,16 +10279,17 @@ function writeRegistryItems(tree, options) {
   for (const item of tree.items) {
     const targetBaseDir = getTargetDir(item.type, aliases);
     for (const file of item.files) {
-      const fileName = basename(file.path);
       let targetPath;
       if (file.target) {
         targetPath = join(projectDir, file.target);
       } else if (item.type === "registry:ui" || item.type === "registry:component") {
-        targetPath = join(projectDir, targetBaseDir, item.name, fileName);
-      } else if (item.type === "registry:type") {
+        targetPath = join(projectDir, targetBaseDir, item.name, basename(file.path));
+      } else if (item.type === "registry:hook") {
+        targetPath = join(projectDir, targetBaseDir, item.name, basename(file.path));
+      } else if (file.path.includes("/")) {
         targetPath = join(projectDir, targetBaseDir, file.path);
       } else {
-        targetPath = join(projectDir, targetBaseDir, fileName);
+        targetPath = join(projectDir, targetBaseDir, basename(file.path));
       }
       if (existsSync(targetPath) && !shouldOverwrite) {
         if (log) log(`  Skipped (exists): ${targetPath}`);