@silgi/module-builder 0.5.0 → 0.6.1

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.C_PBPHPz.mjs';
+import { v as version, n as name } from '../shared/silgi-module-builder.CqQxaS-m.mjs';
 
 const srcDir = fileURLToPath(new URL("src", import.meta.url));
 const subpaths = [
@@ -218,7 +218,7 @@ const build = defineCommand({
           };
           const metaFile = resolve(ctx.options.outDir, "module.json");
           await promises.writeFile(metaFile, JSON.stringify(moduleMeta, null, 2), "utf8");
-          await writeTypes(ctx.options, ctx.options.stub);
+          await writeTypes(ctx.options);
         },
         "build:done": async function(ctx) {
           const logs = [...ctx.warnings].filter((l) => l.startsWith("Potential missing package.json files:"));
@@ -251,91 +251,53 @@ const build = defineCommand({
     });
   }
 });
-async function writeTypes(options, isStub, _moduleMeta) {
+async function writeTypes(options, _moduleMeta) {
   const dtsFile = resolve(options.outDir, "moduleTypes.d.mts");
   if (existsSync(dtsFile)) {
     return;
   }
   const moduleReExports = [];
-  if (!isStub) {
-    const moduleTypesFile = resolve(options.outDir, "module.d.mts");
-    const moduleTypes = await promises.readFile(moduleTypesFile, "utf8").catch(() => "");
-    const normalisedModuleTypes = moduleTypes.replace(/export\s*\{.*?\}/gs, (match) => match.replace(/\b(type|interface)\b/g, ""));
-    for (const e of findExports(normalisedModuleTypes)) {
-      moduleReExports.push(e);
-    }
-    for (const i of findTypeExports(normalisedModuleTypes)) {
-      moduleReExports.push(i);
-    }
+  const moduleTypesFile = resolve(options.outDir, "module.d.mts");
+  const moduleTypes = await promises.readFile(moduleTypesFile, "utf8").catch(() => "");
+  const normalisedModuleTypes = moduleTypes.replace(/export\s*\{.*?\}/gs, (match) => match.replace(/\b(type|interface)\b/g, ""));
+  for (const e of findExports(normalisedModuleTypes)) {
+    moduleReExports.push(e);
   }
-  const schemaShims = [];
-  const moduleImports = [];
-  const schemaImports = [];
-  const moduleExports = [];
-  const hasTypeExport = (name2) => isStub || moduleReExports.find((exp) => exp.names?.includes(name2));
-  if (!hasTypeExport("ModuleOptions")) {
-    schemaImports.push("SilgiModule");
-    moduleImports.push("default as Module");
-    moduleExports.push(`export type ModuleOptions = typeof Module extends SilgiModule<infer O> ? Partial<O> : Record<string, any>`);
+  for (const i of findTypeExports(normalisedModuleTypes)) {
+    moduleReExports.push(i);
   }
+  const moduleImports = [];
+  const hasTypeExport = (name2) => moduleReExports.find((exp) => exp.names?.includes(name2));
   if (hasTypeExport("ModuleOptions")) {
     moduleImports.push("ModuleOptions");
-    schemaShims.push(`  interface SilgiModuleOptions extends ModuleOptions {}`);
   }
   if (hasTypeExport("ModuleRuntimeOptions")) {
     moduleImports.push("ModuleRuntimeOptions");
-    schemaShims.push(`  interface SilgiRuntimeOptions extends ModuleRuntimeOptions {}`);
   }
   if (hasTypeExport("ModuleRuntimeShareds")) {
     moduleImports.push("ModuleRuntimeShareds");
-    schemaShims.push("  interface SilgiRuntimeSharedsExtend extends ModuleRuntimeShareds {}");
   }
   if (hasTypeExport("ModuleEvents")) {
     moduleImports.push("ModuleEvents");
-    schemaShims.push("  interface SilgiEvent extends ModuleEvents {}");
   }
   if (hasTypeExport("ModuleRuntimeContexts")) {
     moduleImports.push("ModuleRuntimeContexts");
-    schemaShims.push("  interface SilgiRuntimeContext extends ModuleRuntimeContexts {}");
   }
   if (hasTypeExport("ModuleHooks")) {
     moduleImports.push("ModuleHooks");
-    schemaShims.push("  interface SilgiHooks extends ModuleHooks {}");
   }
   if (hasTypeExport("ModuleRuntimeHooks")) {
     moduleImports.push("ModuleRuntimeHooks");
-    schemaShims.push("  interface SilgiRuntimeHooks extends ModuleRuntimeHooks {}");
   }
   if (hasTypeExport("ModuleRuntimeActions")) {
     moduleImports.push("ModuleRuntimeActions");
-    schemaShims.push(`  interface SilgiRuntimeActions extends ModuleRuntimeActions {}`);
   }
   if (hasTypeExport("ModuleRuntimeMethods")) {
     moduleImports.push("ModuleRuntimeMethods");
-    schemaShims.push(`  interface SilgiRuntimeMethods extends ModuleRuntimeMethods {}`);
-  }
-  if (hasTypeExport("ModuleRuntimeRouteRules")) {
-    moduleImports.push("ModuleRuntimeRouteRules");
-    schemaShims.push(`  interface SilgiRuntimeRouteRules extends ModuleRuntimeRouteRules {}`);
-  }
-  if (hasTypeExport("ModuleRuntimeRouteRulesConfig")) {
-    moduleImports.push("ModuleRuntimeRouteRulesConfig");
-    schemaShims.push(`  interface SilgiRuntimeRouteRulesConfig extends ModuleRuntimeRouteRulesConfig {}`);
   }
   const dtsContents = `${`
-  ${schemaImports.length ? `import type { ${schemaImports.join(", ")} } from 'silgi/types'` : ""}
-
 ${moduleImports.length ? `import type { ${moduleImports.join(", ")} } from './module.mjs'` : ""}
 
-${schemaShims.length ? `declare module 'silgi/types' {
-${schemaShims.join("\n")}
-}
-` : ""}
-${moduleExports.length ? `
-${moduleExports.join("\n")}` : ""}
-${isStub ? 'export * from "./module.mjs"' : ""}
-${moduleReExports.filter((e) => e.type === "named" || e.type === "default").map((e) => `
-export { ${e.names.map((n) => (n === "default" ? "" : "type ") + n).join(", ")} } from '${e.specifier || "./module.mjs"}'`).join("\n")}
 ${moduleReExports.filter((e) => e.type === "star").map((e) => `
 export * from '${e.specifier || "./module.mjs"}'`).join("\n")}
 `.trim().replace(/[\n\r]{3,}/g, "\n\n")}

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.C_PBPHPz.mjs';
+import { v as version, d as description, n as name } from './shared/silgi-module-builder.CqQxaS-m.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.C_PBPHPz.mjs';
+import './shared/silgi-module-builder.CqQxaS-m.mjs';

package/dist/shared/{silgi-module-builder.C_PBPHPz.mjs → silgi-module-builder.CqQxaS-m.mjs}

@@ -1,5 +1,5 @@
 const name = "@silgi/module-builder";
-const version = "0.5.0";
+const version = "0.6.1";
 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.5.0",
+  "version": "0.6.1",
   "private": false,
   "description": "Complete solution for building Silgi modules",
   "exports": {
@@ -19,19 +19,19 @@
     "consola": "^3.4.2",
     "defu": "^6.1.4",
     "dev-jiti": "^2.4.2",
-    "magic-regexp": "^0.9.0",
+    "magic-regexp": "^0.10.0",
     "mlly": "^1.7.4",
     "pathe": "^2.0.3",
     "pkg-types": "^2.1.0",
-    "silgi": "^0.28.1",
+    "silgi": "^0.37.39",
     "tsconfck": "^3.1.5",
     "unbuild": "^3.5.0",
-    "unimport": "^5.0.0"
+    "unimport": "^5.0.1"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^4.12.0",
-    "@types/node": "^22.14.1",
-    "eslint": "^9.25.0",
+    "@antfu/eslint-config": "^4.13.0",
+    "@types/node": "^22.15.16",
+    "eslint": "^9.26.0",
     "typescript": "^5.8.3"
   },
   "publishConfig": {