@nuxt/module-builder 0.7.1 → 0.8.1

package/dist/chunks/build.mjs

@@ -8,10 +8,8 @@ import { defu } from 'defu';
 import { createRegExp, anyOf } from 'magic-regexp';
 import { consola } from 'consola';
 import { resolvePath, findExports } from 'mlly';
-import { generateTypes, resolveSchema } from 'untyped';
 import { defineCommand } from 'citty';
-import { loadNuxt } from '@nuxt/kit';
-import { n as name, v as version } from '../shared/module-builder.832f08b1.mjs';
+import { n as name, v as version } from '../shared/module-builder.78aa584a.mjs';
 
 const build = defineCommand({
   meta: {
@@ -144,51 +142,37 @@ 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.outDir, moduleMeta, async () => {
-            const nuxt = await loadNuxt({
-              cwd,
-              overrides: {
-                modules: [resolve(cwd, "./src/module")]
-              }
-            });
-            const moduleOptions = await moduleFn.getOptions?.({}, nuxt) || {};
-            await nuxt.close();
-            return moduleOptions;
-          });
+          await writeTypes(ctx.options.outDir, ctx.options.stub);
         }
       }
     });
   }
 });
-async function writeTypes(distDir, meta, getOptions) {
+async function writeTypes(distDir, isStub) {
   const dtsFile = resolve(distDir, "types.d.ts");
   const dtsFileMts = resolve(distDir, "types.d.mts");
   if (existsSync(dtsFile)) {
     return;
   }
-  const moduleTypesFile = resolve(distDir, "module.d.ts");
-  const moduleTypes = await promises.readFile(moduleTypesFile, "utf8").catch(() => "");
-  const typeExports = findExports(
-    // Replace `export { type Foo }` with `export { Foo }`
-    moduleTypes.replace(
-      /export\s*\{.*?\}/gs,
-      (match) => match.replace(/\btype\b/g, "")
-    )
-  );
-  const isStub = moduleTypes.includes("export *");
+  const moduleReExports = [];
+  if (!isStub) {
+    const moduleTypesFile = resolve(distDir, "module.d.ts");
+    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 appShims = [];
   const schemaShims = [];
   const moduleImports = [];
-  const moduleDeclarations = [];
-  const hasTypeExport = (name2) => isStub || typeExports.find((exp) => exp.names.includes(name2));
-  if (meta.configKey) {
-    schemaShims.push(`  interface NuxtConfig { ['${meta.configKey}']?: Partial<ModuleOptions> }`);
-    schemaShims.push(`  interface NuxtOptions { ['${meta.configKey}']?: ModuleOptions }`);
-    if (hasTypeExport("ModuleOptions")) {
-      moduleImports.push("ModuleOptions");
-    } else {
-      moduleDeclarations.push(`  ${generateTypes(await resolveSchema(await getOptions()), { interfaceName: "ModuleOptions" })}`);
-    }
+  const schemaImports = [];
+  const moduleExports = [];
+  const hasTypeExport = (name2) => isStub || moduleReExports.find((exp) => exp.names.includes(name2));
+  if (!hasTypeExport("ModuleOptions")) {
+    schemaImports.push("NuxtModule");
+    moduleImports.push("default as Module");
+    moduleExports.push(`export type ModuleOptions = typeof Module extends NuxtModule<infer O> ? Partial<O> : Record<string, any>`);
   }
   if (hasTypeExport("ModuleHooks")) {
     moduleImports.push("ModuleHooks");
@@ -211,9 +195,10 @@ async function writeTypes(distDir, meta, getOptions) {
     schemaShims.push("  interface PublicRuntimeConfig extends ModulePublicRuntimeConfig {}");
   }
   const dtsContents = `
-import type { ${moduleImports.join(", ")} } from './module'
+  ${schemaImports.length ? `import type { ${schemaImports.join(", ")} } from '@nuxt/schema'` : ""}
+
+${moduleImports.length ? `import type { ${moduleImports.join(", ")} } from './module'` : ""}
 
-${moduleDeclarations.join("\n")}
 ${appShims.length ? `declare module '#app' {
 ${appShims.join("\n")}
 }
@@ -226,9 +211,12 @@ ${schemaShims.length ? `declare module 'nuxt/schema' {
 ${schemaShims.join("\n")}
 }
 ` : ""}
-${typeExports[0] ? `
-export type { ${typeExports[0].names.join(", ")} } from './module'` : ""}
-`;
+${moduleExports.length ? `
+${moduleExports.join("\n")}` : ""}
+${isStub ? 'export * from "./module"' : ""}
+${moduleReExports[0] ? `
+export { ${moduleReExports[0].names.map((n) => (n === "default" ? "" : "type ") + n).join(", ")} } from './module'` : ""}
+`.trim().replace(/[\n\r]{3,}/g, "\n\n") + "\n";
   await promises.writeFile(dtsFile, dtsContents, "utf8");
   if (!existsSync(dtsFileMts)) {
     await promises.writeFile(dtsFileMts, dtsContents.replace(/\.\/module/g, "./module.js"), "utf8");

package/dist/cli.mjs

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

package/dist/index.mjs

@@ -10,7 +10,5 @@ import 'defu';
 import 'magic-regexp';
 import 'consola';
 import 'mlly';
-import 'untyped';
 import 'citty';
-import '@nuxt/kit';
-import './shared/module-builder.832f08b1.mjs';
+import './shared/module-builder.78aa584a.mjs';

package/dist/shared/{module-builder.832f08b1.mjs → module-builder.78aa584a.mjs}

@@ -1,5 +1,5 @@
 const name = "@nuxt/module-builder";
-const version = "0.7.1";
+const version = "0.8.1";
 const description = "Complete solution for building Nuxt modules";
 
 export { description as d, name as n, version as v };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/module-builder",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "repository": "nuxt/module-builder",
   "description": "Complete solution for building Nuxt modules",
   "license": "MIT",
@@ -27,34 +27,33 @@
     "mlly": "^1.7.1",
     "pathe": "^1.1.2",
     "pkg-types": "^1.1.1",
-    "tsconfck": "^3.1.0",
-    "unbuild": "^2.0.0",
-    "untyped": "^1.4.2"
+    "tsconfck": "^3.1.1",
+    "unbuild": "^2.0.0"
   },
   "peerDependencies": {
-    "@nuxt/kit": "^3.12.1",
+    "@nuxt/kit": "^3.12.2",
     "nuxi": "^3.12.0"
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^0.3.13",
-    "@nuxt/kit": "^3.12.1",
-    "@nuxt/schema": "^3.12.1",
-    "@types/node": "^20.14.2",
+    "@nuxt/kit": "^3.12.2",
+    "@nuxt/schema": "^3.12.2",
+    "@types/node": "^20.14.9",
     "@vitest/coverage-v8": "^1.6.0",
     "changelogen": "^0.5.5",
-    "eslint": "^9.4.0",
+    "eslint": "^9.5.0",
     "jiti": "^1.21.6",
     "nuxi": "^3.12.0",
-    "nuxt": "^3.12.1",
-    "typescript": "^5.4.5",
+    "nuxt": "^3.12.2",
+    "typescript": "^5.5.2",
     "vitest": "^1.6.0",
-    "vue": "^3.4.27",
-    "vue-tsc": "^2.0.19"
+    "vue": "^3.4.31",
+    "vue-tsc": "^2.0.22"
   },
   "resolutions": {
-    "@nuxt/kit": "^3.12.1",
-    "@nuxt/schema": "^3.12.1",
-    "vue": "^3.4.27"
+    "@nuxt/kit": "^3.12.2",
+    "@nuxt/schema": "^3.12.2",
+    "vue": "^3.4.31"
   },
   "scripts": {
     "build": "unbuild",