silgi 0.19.20 → 0.19.22

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.19.20";
+const version = "0.19.22";
 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, findTypeExports, 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';
@@ -332,20 +332,26 @@ const frameworkSetup = [emptyFramework, h3Framework, nitroFramework, nuxtFramewo
 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") {
-        continue;
+      const moduleReExports = [];
+      if (module.entryPath.endsWith("src/module.ts")) {
+        module.entryPath = module.entryPath.replace(/src\/module\.ts$/, "dist/module.mjs");
       }
-      const exports = module.meta.exports;
-      if (!exports?.length)
-        continue;
+      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 findTypeExports(normalisedModuleTypes)) {
+        moduleReExports.push(e);
+      }
+      for (const e of findExports(normalisedModuleTypes)) {
+        moduleReExports.push(e);
+      }
+      const hasTypeExport = (name) => moduleReExports.find((exp) => exp.names?.includes(name));
       const configKey = module.meta.configKey;
       const moduleName = module.meta.name || module.meta._packageName;
       options.importItems[configKey] = {
         import: [],
         from: module.meta._packageName ? moduleName : relativeWithDot(silgi.options.build.typesDir, module.entryPath)
       };
-      const exportedTypes = exports.filter((exp) => exp.type).map((exp) => exp.name);
-      if (exportedTypes.includes("ModuleOptions")) {
+      if (hasTypeExport("ModuleOptions")) {
         const importName = `_${hash(`${configKey}ModuleOptions`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleOptions as ${importName}`,
@@ -354,7 +360,7 @@ async function registerModuleExportScan(silgi) {
         });
         options.options.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleRuntimeOptions")) {
+      if (hasTypeExport("ModuleRuntimeOptions")) {
         const importName = `_${hash(`${configKey}ModuleRuntimeOptions`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleRuntimeOptions as ${importName}`,
@@ -363,7 +369,7 @@ async function registerModuleExportScan(silgi) {
         });
         options.runtimeOptions.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleRuntimeShareds")) {
+      if (hasTypeExport("ModuleRuntimeShareds")) {
         const importName = `_${hash(`${configKey}ModuleRuntimeShareds`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleRuntimeShareds as ${importName}`,
@@ -372,7 +378,7 @@ async function registerModuleExportScan(silgi) {
         });
         options.shareds.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleEvents")) {
+      if (hasTypeExport("ModuleEvents")) {
         const importName = `_${hash(`${configKey}ModuleEvents`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleEvents as ${importName}`,
@@ -381,7 +387,7 @@ async function registerModuleExportScan(silgi) {
         });
         options.events.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleRuntimeContexts")) {
+      if (hasTypeExport("ModuleRuntimeContexts")) {
         const importName = `_${hash(`${configKey}ModuleRuntimeContexts`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleRuntimeContexts as ${importName}`,
@@ -390,7 +396,7 @@ async function registerModuleExportScan(silgi) {
         });
         options.contexts.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleHooks")) {
+      if (hasTypeExport("ModuleHooks")) {
         const importName = `_${hash(`${configKey}ModuleHooks`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleHooks as ${importName}`,
@@ -399,7 +405,7 @@ async function registerModuleExportScan(silgi) {
         });
         options.hooks.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleRuntimeHooks")) {
+      if (hasTypeExport("ModuleRuntimeHooks")) {
         const importName = `_${hash(`${configKey}RuntimeHooks`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleRuntimeHooks as ${importName}`,
@@ -408,7 +414,7 @@ async function registerModuleExportScan(silgi) {
         });
         options.runtimeHooks.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleRuntimeActions")) {
+      if (hasTypeExport("ModuleRuntimeActions")) {
         const importName = `_${hash(`${configKey}ModuleRuntimeActions`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleRuntimeActions as ${importName}`,
@@ -417,7 +423,7 @@ async function registerModuleExportScan(silgi) {
         });
         options.actions.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleRuntimeMethods")) {
+      if (hasTypeExport("ModuleRuntimeMethods")) {
         const importName = `_${hash(`${configKey}ModuleRuntimeMethods`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleRuntimeMethods as ${importName}`,
@@ -426,7 +432,7 @@ async function registerModuleExportScan(silgi) {
         });
         options.methods.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleRuntimeRouteRules")) {
+      if (hasTypeExport("ModuleRuntimeRouteRules")) {
         const importName = `_${hash(`${configKey}ModuleRuntimeRouteRules`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleRuntimeRouteRules as ${importName}`,
@@ -435,7 +441,7 @@ async function registerModuleExportScan(silgi) {
         });
         options.routeRules.push({ key: configKey, value: importName });
       }
-      if (exportedTypes.includes("ModuleRuntimeRouteRulesConfig")) {
+      if (hasTypeExport("ModuleRuntimeRouteRulesConfig")) {
         const importName = `_${hash(`${configKey}ModuleRuntimeRouteRulesConfig`)}`;
         options.importItems[configKey].import.push({
           name: `ModuleRuntimeRouteRulesConfig as ${importName}`,

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.19.20";
+const version = "0.19.22";
 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.20";
+const version = "0.19.22";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/types/index.d.mts

@@ -436,14 +436,6 @@ interface ModuleMeta {
     author?: string;
     /** Module license. */
     license?: string;
-    /** exports */
-    exports?: {
-        name: string;
-        as?: string;
-        from?: string;
-        type?: boolean;
-        options?: Record<string, any>;
-    }[];
     /** Module version. */
     version?: string;
     /**

package/dist/types/index.d.ts

@@ -436,14 +436,6 @@ interface ModuleMeta {
     author?: string;
     /** Module license. */
     license?: string;
-    /** exports */
-    exports?: {
-        name: string;
-        as?: string;
-        from?: string;
-        type?: boolean;
-        options?: Record<string, any>;
-    }[];
     /** Module version. */
     version?: string;
     /**

package/package.json

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