silgi 0.26.6 → 0.26.7

package/dist/build.mjs

@@ -28,6 +28,7 @@ import '@oxc-parser/wasm';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
+import 'apiful/openapi';
 import 'scule';
 import './cli/types.mjs';
 import 'c12';

package/dist/cli/dev.mjs

@@ -34,6 +34,7 @@ import '@oxc-parser/wasm';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
+import 'apiful/openapi';
 import 'scule';
 import './types.mjs';
 import 'c12';
@@ -44,7 +45,6 @@ import 'consola/utils';
 import 'escape-string-regexp';
 import 'pkg-types';
 import 'pathe/utils';
-import 'apiful/openapi';
 import 'node:child_process';
 import 'picocolors';
 

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.26.6";
+const version = "0.26.7";
 const packageJson = {
 	version: version};
 

package/dist/cli/init.mjs

@@ -30,6 +30,7 @@ import '@oxc-parser/wasm';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
+import 'apiful/openapi';
 import 'scule';
 import './types.mjs';
 import 'c12';
@@ -40,7 +41,6 @@ import 'consola/utils';
 import 'escape-string-regexp';
 import 'pkg-types';
 import 'pathe/utils';
-import 'apiful/openapi';
 import 'node:child_process';
 import 'picocolors';
 import '../_chunks/silgiApp.mjs';

package/dist/cli/install.mjs

@@ -32,9 +32,9 @@ import '@oxc-parser/wasm';
 import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
+import 'apiful/openapi';
 import 'scule';
 import 'pathe/utils';
-import 'apiful/openapi';
 import 'picocolors';
 import '../_chunks/silgiApp.mjs';
 import 'unctx';

package/dist/cli/prepare.mjs

@@ -1,53 +1,17 @@
 import { defineCommand, runCommand } from 'citty';
-import { join, resolve } from 'pathe';
+import { resolve } from 'pathe';
 import { version } from 'silgi/meta';
 import { d as prepareEnv, c as createSilgiCLI, a as prepare$2, b as writeTypesAndFiles, w as writeCoreFile, p as prepareBuild, g as generateApp } from './writeTypesAndFiles.mjs';
-import { generateDTS } from 'apiful/openapi';
-import { consola } from 'consola';
-import { hasSilgiModule, addTemplate } from 'silgi/kit';
 import { execSync } from 'node:child_process';
 import { readFileSync } from 'node:fs';
 import * as p from '@clack/prompts';
+import { consola } from 'consola';
 import { createJiti } from 'dev-jiti';
 import color from 'picocolors';
 import { useSilgiCLI } from 'silgi';
 import { a as silgiCLIIClose } from '../_chunks/silgiApp.mjs';
 import { l as loadOptions } from './types.mjs';
 
-async function generateApiFul(silgi) {
-  const config = silgi.options.apiFul;
-  if (!config.services || hasSilgiModule("openapi")) {
-    config.services ??= {};
-    config.services = {
-      silgi: {
-        schema: join(silgi.options.build.dir, "openapi.json")
-      }
-    };
-  }
-  const resolvedOpenAPIServices = Object.fromEntries(
-    Object.entries(config?.services ?? {}).filter(([, service]) => Boolean(service.schema))
-  );
-  if (Object.keys(resolvedOpenAPIServices).length === 0) {
-    consola.info("No OpenAPI schemas found, skipping generation");
-    return;
-  }
-  for (const service of Object.values(resolvedOpenAPIServices)) {
-    if (typeof service.schema === "string" && !service.schema.startsWith("http")) {
-      service.schema = resolve(silgi.options.rootDir, service.schema);
-    }
-  }
-  const types = await generateDTS(resolvedOpenAPIServices);
-  silgi.hook("prepare:types", (opts) => {
-    opts.references.push({ path: "./apiful.d.ts" });
-  });
-  addTemplate({
-    filename: "types/apiful.d.ts",
-    where: ".silgi",
-    write: true,
-    getContents: () => types
-  });
-}
-
 const commonArgs = {
   dir: {
     type: "string",
@@ -263,7 +227,6 @@ const prepare = defineCommand({
       activeEnvironment: args.env
     });
     await prepare$2();
-    await generateApiFul(silgi);
     await writeTypesAndFiles(silgi);
     await writeCoreFile(silgi);
     await prepareBuild(silgi);

package/dist/cli/writeTypesAndFiles.mjs

@@ -1,6 +1,6 @@
 import { genObjectFromRawEntries, genObjectFromRaw, genObjectFromValues } from 'knitwork';
 import { join, resolve, relative, dirname, basename, extname, isAbsolute } from 'pathe';
-import { writeFile, relativeWithDot, hash, resolveAlias, directoryToURL, addTemplate, hasError, parseServices, normalizeTemplate, useLogger, resolveSilgiPath, genEnsureSafeVar, isDirectory } from 'silgi/kit';
+import { writeFile, relativeWithDot, hash, resolveAlias, directoryToURL, addTemplate, hasError, parseServices, hasSilgiModule, normalizeTemplate, useLogger, resolveSilgiPath, genEnsureSafeVar, isDirectory } from 'silgi/kit';
 import { existsSync, promises, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
 import consola, { consola as consola$1 } from 'consola';
@@ -25,6 +25,7 @@ import { parseSync } from '@oxc-parser/wasm';
 import { klona } from 'klona';
 import { useSilgiRuntimeConfig, initRuntimeConfig } from 'silgi/runtime';
 import { createStorage, builtinDrivers } from 'unstorage';
+import { generateDTS } from 'apiful/openapi';
 import { peerDependencies } from 'silgi/meta';
 import { snakeCase } from 'scule';
 import { l as loadOptions, s as silgiGenerateType } from './types.mjs';
@@ -1377,6 +1378,40 @@ async function createStorageCLI(silgi) {
   return storage;
 }
 
+async function generateApiFul(silgi) {
+  const config = silgi.options.apiFul;
+  if (!config.services || hasSilgiModule("openapi")) {
+    config.services ??= {};
+    config.services = {
+      silgi: {
+        schema: join(silgi.options.build.dir, "openapi.json")
+      }
+    };
+  }
+  const resolvedOpenAPIServices = Object.fromEntries(
+    Object.entries(config?.services ?? {}).filter(([, service]) => Boolean(service.schema))
+  );
+  if (Object.keys(resolvedOpenAPIServices).length === 0) {
+    consola$1.info("No OpenAPI schemas found, skipping generation");
+    return;
+  }
+  for (const service of Object.values(resolvedOpenAPIServices)) {
+    if (typeof service.schema === "string" && !service.schema.startsWith("http")) {
+      service.schema = resolve(silgi.options.rootDir, service.schema);
+    }
+  }
+  const types = await generateDTS(resolvedOpenAPIServices);
+  silgi.hook("prepare:types", (opts) => {
+    opts.references.push({ path: "./apiful.d.ts" });
+  });
+  addTemplate({
+    filename: "types/apiful.d.ts",
+    where: ".silgi",
+    write: true,
+    getContents: () => types
+  });
+}
+
 const vueShim = {
   filename: "delete/testtest.d.ts",
   where: ".silgi",
@@ -1695,6 +1730,7 @@ async function createSilgiCLI(config = {}, opts = {}) {
   silgi.hooks.addHooks(silgi.options.hooks);
   await installModules(silgi);
   await silgi.hooks.callHook("scanFiles:done", silgi);
+  await generateApiFul(silgi);
   await commands(silgi);
   await installPackages(silgi);
   await generateApp(silgi);

package/package.json

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