@silgi/module-builder 0.7.5 → 0.7.6

package/dist/chunks/build.mjs

@@ -15,7 +15,7 @@ import { pkgDir } from 'silgi/runtime/meta';
 import { parse } from 'tsconfck';
 import { convertCompilerOptionsFromJson } from 'typescript';
 import { scanExports } from 'unimport';
-import { v as version, n as name } from '../shared/silgi-module-builder.C81SXUbd.mjs';
+import { v as version, n as name } from '../shared/silgi-module-builder.B-36xW1_.mjs';
 
 const subpaths = [
   "runtime",
@@ -105,8 +105,7 @@ const build = defineCommand({
     if (isTypesFolder) {
       entries.push({
         input: "src/types/index.ts",
-        outDir: `${outDir}`,
-        name: "types",
+        outDir: `${outDir}/types`,
         builder: "rollup"
       });
     }
@@ -267,7 +266,7 @@ async function writeTypes(options, _moduleMeta) {
   if (!options.stub) {
     return;
   }
-  const dtsFile = resolve(options.outDir, "types.d.mts");
+  const dtsFile = resolve(options.outDir, "types/index.d.mts");
   const moduleReExports = [];
   const moduleTypesFile = resolve(options.rootDir, "src/types/index.ts");
   const moduleTypes = await promises.readFile(moduleTypesFile, "utf8").catch(() => "");
@@ -314,8 +313,9 @@ async function writeTypes(options, _moduleMeta) {
     moduleImports.push("MetaData");
   }
   let fromPath;
+  let prevContent;
   if (existsSync(dtsFile)) {
-    const prevContent = await promises.readFile(dtsFile, "utf8").catch(() => "");
+    prevContent = await promises.readFile(dtsFile, "utf8").catch(() => "");
     const match = prevContent.match(/export\s+\*\s+from\s+["'](.+)["']/);
     if (match) {
       fromPath = match[1];
@@ -323,14 +323,19 @@ async function writeTypes(options, _moduleMeta) {
   }
   let dtsContents;
   const importFrom = fromPath || "./module.mjs";
-  dtsContents = `${`
-${moduleImports.length ? `import type { ${moduleImports.join(", ")} } from '${importFrom}'` : ""}
+  dtsContents = `${`${moduleImports.length ? `import type { ${moduleImports.join(", ")} } from '${importFrom}'
 
-${moduleImports.length ? `
-export type { ${moduleImports.join(", ")} }` : ""}
-`.trim().replace(/[\n\r]{3,}/g, "\n\n")}
+export type { ${moduleImports.join(", ")} }` : ""}`.trim()}
 `;
-  await promises.writeFile(dtsFile, dtsContents, "utf8");
+  let mergedContent = dtsContents;
+  if (prevContent) {
+    const prevLines = prevContent.split("\n").map((l) => l.trim());
+    const newLines = dtsContents.split("\n").map((l) => l.trim());
+    const uniqueLines = newLines.filter((line) => line && !prevLines.includes(line));
+    mergedContent = `${uniqueLines.join("\n")}
+${prevContent}`;
+  }
+  await promises.writeFile(dtsFile, mergedContent, "utf8");
 }
 async function loadTSCompilerOptions(path) {
   const config = await parse(path);

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 import { consola } from 'consola';
-import { v as version, d as description, n as name } from './shared/silgi-module-builder.C81SXUbd.mjs';
+import { v as version, d as description, n as name } from './shared/silgi-module-builder.B-36xW1_.mjs';
 
 const _rDefault = (r) => r && typeof r === "object" && "default" in r ? r.default : r;
 const main = defineCommand({

package/dist/index.mjs

@@ -16,4 +16,4 @@ import 'silgi/runtime/meta';
 import 'tsconfck';
 import 'typescript';
 import 'unimport';
-import './shared/silgi-module-builder.C81SXUbd.mjs';
+import './shared/silgi-module-builder.B-36xW1_.mjs';

package/dist/shared/{silgi-module-builder.C81SXUbd.mjs → silgi-module-builder.B-36xW1_.mjs}

@@ -1,5 +1,5 @@
 const name = "@silgi/module-builder";
-const version = "0.7.5";
+const version = "0.7.6";
 const description = "Complete solution for building Silgi modules";
 
 export { description as d, name as n, version as v };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@silgi/module-builder",
   "type": "module",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "private": false,
   "description": "Complete solution for building Silgi modules",
   "exports": {