silgi 0.19.19 → 0.19.21

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.19.19";
+const version = "0.19.21";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/cli/common.mjs

@@ -11,7 +11,7 @@ import { scanExports, createUnimport, toExports } from 'unimport';
 import { c as createRouteRules } from '../_chunks/routeRules.mjs';
 import * as p from '@clack/prompts';
 import * as dotenv from 'dotenv';
-import { resolveModuleExportNames, resolvePath, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
+import { resolveModuleExportNames, findExports, resolvePath, parseNodeModulePath, lookupNodeModuleSubpath } from 'mlly';
 import { createJiti } from 'dev-jiti';
 import { a as hasInstalledModule, h as hasError } from './compatibility.mjs';
 import { fileURLToPath } from 'node:url';
@@ -333,6 +333,118 @@ async function registerModuleExportScan(silgi) {
   silgi.hook("prepare:schema.ts", async (options) => {
     for (const module of silgi.scanModules) {
       if (module.meta._packageName || silgi.options.preset === "npm-package") {
+        const moduleReExports = [];
+        const moduleTypes = await promises.readFile(module.entryPath.replace(/\.mjs$/, "Types.d.ts"), "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 hasTypeExport = (name) => moduleReExports.find((exp) => exp.names?.includes(name));
+        const configKey2 = module.meta.configKey;
+        const moduleName2 = module.meta.name || module.meta._packageName;
+        options.importItems[configKey2] = {
+          import: [],
+          from: module.meta._packageName ? moduleName2 : relativeWithDot(silgi.options.build.typesDir, module.entryPath)
+        };
+        if (hasTypeExport("ModuleOptions")) {
+          const importName = `_${hash(`${configKey2}ModuleOptions`)}`;
+          options.importItems[configKey2].import.push({
+            name: `ModuleOptions as ${importName}`,
+            type: true,
+            key: importName
+          });
+          options.options.push({ key: configKey2, value: importName });
+        }
+        if (hasTypeExport("ModuleRuntimeOptions")) {
+          const importName = `_${hash(`${configKey2}ModuleRuntimeOptions`)}`;
+          options.importItems[configKey2].import.push({
+            name: `ModuleRuntimeOptions as ${importName}`,
+            type: true,
+            key: importName
+          });
+          options.runtimeOptions.push({ key: configKey2, value: importName });
+        }
+        if (hasTypeExport("ModuleRuntimeShareds")) {
+          const importName = `_${hash(`${configKey2}ModuleRuntimeShareds`)}`;
+          options.importItems[configKey2].import.push({
+            name: `ModuleRuntimeShareds as ${importName}`,
+            type: true,
+            key: importName
+          });
+          options.shareds.push({ key: configKey2, value: importName });
+        }
+        if (hasTypeExport("ModuleEvents")) {
+          const importName = `_${hash(`${configKey2}ModuleEvents`)}`;
+          options.importItems[configKey2].import.push({
+            name: `ModuleEvents as ${importName}`,
+            type: true,
+            key: importName
+          });
+          options.events.push({ key: configKey2, value: importName });
+        }
+        if (hasTypeExport("ModuleRuntimeContexts")) {
+          const importName = `_${hash(`${configKey2}ModuleRuntimeContexts`)}`;
+          options.importItems[configKey2].import.push({
+            name: `ModuleRuntimeContexts as ${importName}`,
+            type: true,
+            key: importName
+          });
+          options.contexts.push({ key: configKey2, value: importName });
+        }
+        if (hasTypeExport("ModuleHooks")) {
+          const importName = `_${hash(`${configKey2}ModuleHooks`)}`;
+          options.importItems[configKey2].import.push({
+            name: `ModuleHooks as ${importName}`,
+            type: true,
+            key: importName
+          });
+          options.hooks.push({ key: configKey2, value: importName });
+        }
+        if (hasTypeExport("ModuleRuntimeHooks")) {
+          const importName = `_${hash(`${configKey2}RuntimeHooks`)}`;
+          options.importItems[configKey2].import.push({
+            name: `ModuleRuntimeHooks as ${importName}`,
+            type: true,
+            key: importName
+          });
+          options.runtimeHooks.push({ key: configKey2, value: importName });
+        }
+        if (hasTypeExport("ModuleRuntimeActions")) {
+          const importName = `_${hash(`${configKey2}ModuleRuntimeActions`)}`;
+          options.importItems[configKey2].import.push({
+            name: `ModuleRuntimeActions as ${importName}`,
+            type: true,
+            key: importName
+          });
+          options.actions.push({ key: configKey2, value: importName });
+        }
+        if (hasTypeExport("ModuleRuntimeMethods")) {
+          const importName = `_${hash(`${configKey2}ModuleRuntimeMethods`)}`;
+          options.importItems[configKey2].import.push({
+            name: `ModuleRuntimeMethods as ${importName}`,
+            type: true,
+            key: importName
+          });
+          options.methods.push({ key: configKey2, value: importName });
+        }
+        if (hasTypeExport("ModuleRuntimeRouteRules")) {
+          const importName = `_${hash(`${configKey2}ModuleRuntimeRouteRules`)}`;
+          options.importItems[configKey2].import.push({
+            name: `ModuleRuntimeRouteRules as ${importName}`,
+            type: true,
+            key: importName
+          });
+          options.routeRules.push({ key: configKey2, value: importName });
+        }
+        if (hasTypeExport("ModuleRuntimeRouteRulesConfig")) {
+          const importName = `_${hash(`${configKey2}ModuleRuntimeRouteRulesConfig`)}`;
+          options.importItems[configKey2].import.push({
+            name: `ModuleRuntimeRouteRulesConfig as ${importName}`,
+            type: true,
+            key: importName
+          });
+          options.routeRulesConfig.push({ key: configKey2, value: importName });
+        }
         continue;
       }
       const exports = module.meta.exports;

package/dist/cli/types.mjs

@@ -718,7 +718,7 @@ async function silgiGenerateType(silgi) {
   }
   const references = [];
   if (silgi.options.preset === "npm-package") {
-    references.push({ types: relativeWithDot(silgi.options.rootDir, join(silgi.options.build.typesDir, "moduleTypes.d.ts")) });
+    references.push({ types: relativeWithDot(tsconfigDir, join(silgi.options.rootDir, "dist/moduleTypes.d.ts")) });
   }
   await Promise.all([...silgi.options.modules, ...silgi.options._modules].map(async (id) => {
     if (typeof id !== "string") {

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.19.19";
+const version = "0.19.21";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.19.19";
+const version = "0.19.21";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.19.19",
+  "version": "0.19.21",
   "private": false,
   "sideEffects": false,
   "exports": {