@dsai-io/tools 1.2.4 → 1.3.0

package/dist/index.cjs

@@ -1482,7 +1482,7 @@ var init_optimizer = __esm({
 });
 
 // src/version.ts
-var version = "0.0.1";
+var version = "1.3.0";
 var logLevelSchema = zod.z.enum(["silent", "error", "warn", "info", "debug", "verbose"]);
 var outputFormatSchema = zod.z.enum(["css", "scss", "less", "json", "js", "ts", "esm", "cjs"]);
 var frameworkSchema = zod.z.enum(["react", "vue", "angular", "svelte", "vanilla"]);
@@ -9834,7 +9834,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;
@@ -9854,6 +9854,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]) {
@@ -9997,6 +10007,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",
@@ -10173,7 +10185,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}`;
@@ -10181,6 +10193,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) => {
@@ -10191,18 +10215,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) {
@@ -10256,16 +10268,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 = path2.basename(file.path);
       let targetPath;
       if (file.target) {
         targetPath = path2.join(projectDir, file.target);
       } else if (item.type === "registry:ui" || item.type === "registry:component") {
-        targetPath = path2.join(projectDir, targetBaseDir, item.name, fileName);
-      } else if (item.type === "registry:type") {
+        targetPath = path2.join(projectDir, targetBaseDir, item.name, path2.basename(file.path));
+      } else if (item.type === "registry:hook") {
+        targetPath = path2.join(projectDir, targetBaseDir, item.name, path2.basename(file.path));
+      } else if (file.path.includes("/")) {
         targetPath = path2.join(projectDir, targetBaseDir, file.path);
       } else {
-        targetPath = path2.join(projectDir, targetBaseDir, fileName);
+        targetPath = path2.join(projectDir, targetBaseDir, path2.basename(file.path));
       }
       if (fs3.existsSync(targetPath) && !shouldOverwrite) {
         if (log) log(`  Skipped (exists): ${targetPath}`);