silgi 0.28.7 → 0.28.9

package/dist/cli/index.mjs

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

package/dist/cli/silgi.mjs

@@ -1,7 +1,7 @@
 import { generateDTS } from 'apiful/openapi';
 import consola$1, { consola } from 'consola';
 import { join, resolve, dirname, isAbsolute, relative, basename, extname } from 'pathe';
-import { hasSilgiModule, addTemplate, normalizeTemplate, useLogger, genEnsureSafeVar, hash, relativeWithDot, writeFile, isDirectory, resolveAlias as resolveAlias$1, directoryToURL, hasError, parseServices, resolveSilgiPath } from 'silgi/kit';
+import { hasSilgiModule, addTemplate, normalizeTemplate, useLogger, genEnsureSafeVar, hash, relativeWithDot, writeFile, isDirectory, resolveAlias as resolveAlias$1, directoryToURL, hasError, parseServices, addNPMPackage, resolveSilgiPath } from 'silgi/kit';
 import { mkdirSync, existsSync, writeFileSync, promises, readFileSync } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
 import { genObjectFromRawEntries, genObjectFromRaw, genObjectFromValues } from 'knitwork';
@@ -28,7 +28,6 @@ import { parseSync } from '@oxc-parser/wasm';
 import { klona } from 'klona';
 import { useSilgiRuntimeConfig, initRuntimeConfig } from 'silgi/runtime';
 import { createStorage, builtinDrivers } from 'unstorage';
-import { peerDependencies } from 'silgi/meta';
 import { snakeCase } from 'scule';
 
 async function generateApiFul(silgi) {
@@ -2190,17 +2189,29 @@ async function createStorageCLI(silgi) {
 }
 
 async function installPackages(silgi) {
+  await addNPMPackage([
+    {
+      name: "@fastify/deepmerge",
+      isDev: false
+    },
+    {
+      name: "@silgi/ecosystem",
+      isDev: false
+    },
+    {
+      name: "unadapter",
+      isDev: false
+    }
+  ]);
   const packages = {
     dependencies: {
-      "@fastify/deepmerge": peerDependencies["@fastify/deepmerge"],
-      "@silgi/ecosystem": peerDependencies["@silgi/ecosystem"],
       ...silgi.options.installPackages?.dependencies
     },
     devDependencies: {
       ...silgi.options.installPackages?.devDependencies
     }
   };
-  await silgi.callHook("prepare:installPackages", packages);
+  console.log(packages);
   if (silgi.options.preset === "npm-package") {
     packages.devDependencies = {
       ...packages.devDependencies,

package/dist/cli/types.mjs

@@ -86,8 +86,6 @@ const SilgiCLIDefaults = {
     presets: [],
     virtualImports: ["#silgiImports"]
   },
-  // virtual: {},
-  // compressPublicAssets: false,
   ignore: [],
   // Dev
   dev: false,
@@ -114,17 +112,6 @@ const SilgiCLIDefaults = {
       "**/tmp/**"
     ]
   },
-  // devProxy: {},
-  // Logging
-  // logging: {
-  //   compressedSizes: true,
-  //   buildSuccess: true,
-  // },
-  // Routing
-  // baseURL: process.env.NITRO_APP_BASE_URL || '/',
-  // handlers: [],
-  // devHandlers: [],
-  // errorHandler: undefined,
   // Advanced
   typescript: {
     strict: false,
@@ -138,7 +125,7 @@ const SilgiCLIDefaults = {
   },
   conditions: [],
   nodeModulesDirs: [],
-  // hooks: {},
+  hooks: {},
   commands: {},
   // Framework
   framework: {
@@ -148,7 +135,12 @@ const SilgiCLIDefaults = {
   extensions: [".js", ".jsx", ".mjs", ".ts", ".tsx", ".vue"],
   ignoreOptions: void 0,
   // 3. party
-  apiFul: {}
+  apiFul: {},
+  // Kit
+  installPackages: {
+    dependencies: {},
+    devDependencies: {}
+  }
 };
 
 const fallbackCompatibilityDate = "2025-02-04";
@@ -349,7 +341,9 @@ async function resolvePathOptions(options) {
     }
     options.alias ||= {};
     options.alias[packageJson.name] = join(options.rootDir, "src/module");
-    options.alias[`${packageJson.name}/runtime/`] = join(options.rootDir, "src/runtime");
+    options.alias[`${packageJson.name}/runtime`] = join(options.rootDir, "src/runtime");
+    options.alias[`${packageJson.name}/data`] = join(options.rootDir, "src/data");
+    options.alias[`${packageJson.name}/data/*`] = join(options.rootDir, "src/data/*");
     options.alias[`${packageJson.name}/runtime/*`] = join(options.rootDir, "src/runtime/*");
     options.alias[`${packageJson.name}/types`] = join(options.rootDir, "src/types");
   }
@@ -357,9 +351,7 @@ async function resolvePathOptions(options) {
     options.alias = {
       ...options.alias,
       "silgi/runtime": join(runtimeDir),
-      "#internal/silgi": join(runtimeDir),
-      "silgi/runtime/*": join(runtimeDir, "*"),
-      "#internal/silgi/*": join(runtimeDir, "*")
+      "silgi/runtime/*": join(runtimeDir, "*")
     };
   }
   options.alias = {

package/dist/kit/index.d.mts

@@ -4,6 +4,12 @@ import { ConsolaOptions, ConsolaInstance } from 'consola';
 import * as rfc6902 from 'rfc6902';
 import { IncomingMessage, ServerResponse } from 'node:http';
 
+declare function addNPMPackage(data: {
+    name: string;
+    version?: string;
+    isDev?: boolean;
+}[]): Promise<void>;
+
 declare function hasError(type: SilgiCLI['errors'][0]['type'], silgi?: SilgiCLI): boolean;
 
 declare function directoryToURL(dir: string): URL;
@@ -283,5 +289,5 @@ declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolea
 declare const baseHeaderBannerComment: string[];
 declare function processFilePath(src: string): string;
 
-export { MODE_RE, MigrationStatus, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory, isH3, isNitro, isNuxt, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
+export { MODE_RE, MigrationStatus, addNPMPackage, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory, isH3, isNitro, isNuxt, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
 export type { FunctionConfig, JsonPatch, MigrationData, MigrationInfo, MigrationOptions, MigrationResult };

package/dist/kit/index.mjs

@@ -1,4 +1,6 @@
-import { tryUseSilgiCLI, useSilgiCLI, useSilgi } from 'silgi';
+import { execSync } from 'node:child_process';
+import { u as useSilgiCLI } from '../_chunks/silgiApp.mjs';
+import { tryUseSilgiCLI, useSilgiCLI as useSilgiCLI$1, useSilgi } from 'silgi';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import { resolvePath as resolvePath$1 } from 'mlly';
 import fsp, { mkdir, readFile, writeFile as writeFile$1 } from 'node:fs/promises';
@@ -16,9 +18,27 @@ import { c as checkSilgiCompatibility } from '../cli/compatibility.mjs';
 import { withLeadingSlash } from 'ufo';
 import { resolveAlias as resolveAlias$1 } from 'pathe/utils';
 import { hash as hash$2 } from 'silgi/kit';
+import 'unctx';
 import 'semver/functions/satisfies.js';
 import 'silgi/meta';
 
+async function addNPMPackage(data) {
+  const silgi = useSilgiCLI();
+  for (const item of data) {
+    const getPackageVersion = execSync(
+      `pnpm info ${item.name} version`,
+      { encoding: "utf-8" }
+    );
+    let version = item.version || getPackageVersion.trim();
+    version = `^${version}`;
+    if (item.isDev) {
+      silgi.options.installPackages.devDependencies[item.name] = version;
+    } else {
+      silgi.options.installPackages.dependencies[item.name] = version;
+    }
+  }
+}
+
 function hasError(type, silgi) {
   silgi = silgi ?? tryUseSilgiCLI() ?? void 0;
   if (silgi && silgi.errors.some((error) => error.type === type)) {
@@ -66,7 +86,7 @@ function _compilePathTemplate(contents) {
 }
 
 async function writeFile(file, contents, log = false) {
-  const silgi = useSilgiCLI();
+  const silgi = useSilgiCLI$1();
   if (silgi.errors.length) {
     return;
   }
@@ -569,7 +589,7 @@ function _defineSilgiModule(definition) {
   }
   const module = defu(definition, { meta: {} });
   module.meta.configKey ||= module.meta.name;
-  async function getOptions(inlineOptions, silgi = useSilgiCLI()) {
+  async function getOptions(inlineOptions, silgi = useSilgiCLI$1()) {
     const nuxtConfigOptionsKey = module.meta.configKey || module.meta.name;
     const nuxtConfigOptions = nuxtConfigOptionsKey && nuxtConfigOptionsKey in silgi.options ? silgi.options[nuxtConfigOptionsKey] : {};
     const optionsDefaults = typeof module.defaults === "function" ? await module.defaults(silgi) : module.defaults ?? {};
@@ -769,10 +789,10 @@ function filterInPlace(array, predicate) {
   return array;
 }
 const MODE_RE = /\.(server|client)(\.\w+)*$/;
-function hasSilgiModule(moduleKey, silgi = useSilgiCLI()) {
+function hasSilgiModule(moduleKey, silgi = useSilgiCLI$1()) {
   return silgi.scanModules.some(({ meta }) => meta.configKey === moduleKey) || Object.keys(silgi.scanModules).includes(moduleKey);
 }
-function hasInstalledModule(moduleKey, silgi = useSilgiCLI()) {
+function hasInstalledModule(moduleKey, silgi = useSilgiCLI$1()) {
   const find = silgi.scanModules.find(({ meta }) => meta.configKey === moduleKey);
   return find?.installed ?? false;
 }
@@ -784,7 +804,7 @@ const baseHeaderBannerComment = [
   "/* tslint:disable */"
 ];
 function processFilePath(src) {
-  const silgi = useSilgiCLI();
+  const silgi = useSilgiCLI$1();
   if (silgi.options.typescript.removeFileExtension) {
     src = src.replace(/\.ts$/, "");
     return src;
@@ -793,7 +813,7 @@ function processFilePath(src) {
 }
 
 function addTemplate(_template) {
-  const silgi = useSilgiCLI();
+  const silgi = useSilgiCLI$1();
   const template = normalizeTemplate(_template);
   filterInPlace(silgi.options.build.templates, (p) => normalizeTemplate(p).dst !== template.dst);
   silgi.options.build.templates.push(template);
@@ -827,7 +847,7 @@ function normalizeTemplate(template, buildDir) {
     template.write = true;
   }
   if (!template.dst) {
-    const silgi = useSilgiCLI();
+    const silgi = useSilgiCLI$1();
     const dir = template.where === ".silgi" ? silgi.options.build.dir : template.where === "server" ? silgi.options.silgi.serverDir : template.where === "client" ? silgi.options.silgi.clientDir : silgi.options.silgi.serverDir;
     template.dst = resolve(buildDir ?? dir, template.filename);
   }
@@ -922,4 +942,4 @@ function isValidIp(ip) {
   return false;
 }
 
-export { MODE_RE, MigrationStatus, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
+export { MODE_RE, MigrationStatus, addNPMPackage, addTemplate, baseHeaderBannerComment, createFunction, createFunctionConfigs, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, formatFunctions, genEnsureSafeVar, generateMigration, getAllEntries, getIpAddress, getMigration, hasError, hasInstalledModule, hasSilgiModule, hash, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };

package/dist/types/index.d.mts

@@ -273,7 +273,6 @@ interface SilgiCLIHooks extends SilgiHooks {
     'app:templatesGenerated': (app: SilgiCLI, templates: ResolvedSilgiTemplate[], options?: GenerateAppOptions) => HookResult;
     'scanFiles:done': (app: SilgiCLI) => HookResult;
     'prepare:commands': (commands: SilgiCLI['commands']) => HookResult;
-    'prepare:installPackages': (packages: Record<'dependencies' | 'devDependencies', Record<string, string>>) => HookResult;
 }
 type TSReference = {
     types: string;
@@ -1116,6 +1115,7 @@ interface SilgiOptions {
         [key: string]: any;
     };
     captureError: CaptureError;
+    adapters: Record<string, Adapter<Record<string, any>, TablesSchema, InferModelTypes<TablesSchema>>>;
     [key: string]: any;
 }
 

package/package.json

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