silgi 0.19.10 → 0.19.11

package/dist/cli/types.mjs

@@ -1,9 +1,570 @@
-import { promises, lstatSync } from 'node:fs';
+import { watchConfig, loadConfig } from 'c12';
+import { resolveCompatibilityDatesFromEnv, formatDate, resolveCompatibilityDates } from 'compatx';
+import { klona } from 'klona/full';
+import { isDebug, isTest } from 'std-env';
+import consola from 'consola';
+import { colors } from 'consola/utils';
+import { relative, join, resolve, dirname, isAbsolute } from 'pathe';
+import escapeRE from 'escape-string-regexp';
+import { resolveModuleExportNames } from 'mlly';
+import { existsSync, promises, lstatSync } from 'node:fs';
+import { findWorkspaceDir, readPackageJSON } from 'pkg-types';
+import { resolveSilgiPath, relativeWithDot, resolveSilgiModule } from 'silgi/kit';
+import { runtimeDir, pkgDir } from 'silgi/runtime/meta';
+import { withLeadingSlash, withTrailingSlash } from 'ufo';
 import { defu } from 'defu';
-import { resolve, dirname, join, isAbsolute, relative } from 'pathe';
-import { readPackageJSON } from 'pkg-types';
-import { relativeWithDot, resolveSilgiModule } from 'silgi/kit';
-import { withTrailingSlash } from 'ufo';
+
+const SilgiCLIDefaults = {
+  // General
+  debug: isDebug,
+  // timing: isDebug,
+  logLevel: isTest ? 1 : 3,
+  // runtimeConfig: { app: {}, silgi: {} },
+  appConfig: {},
+  appConfigFiles: [],
+  commandType: "prepare",
+  runtimeConfig: {
+    silgi: {
+      version: "0.0.1"
+    }
+  },
+  serviceParseModules: [],
+  storages: [],
+  devServer: {
+    watch: []
+  },
+  // Dirs
+  scanDirs: [],
+  build: {
+    dir: ".silgi",
+    typesDir: "{{ build.dir }}/types",
+    templates: []
+  },
+  output: {
+    dir: "{{ rootDir }}/.output",
+    serverDir: "{{ output.dir }}/server",
+    publicDir: "{{ output.dir }}/public"
+  },
+  serverDir: "{{ rootDir }}/server",
+  clientDir: "{{ rootDir }}/client",
+  silgi: {
+    serverDir: "{{ serverDir }}/silgi",
+    clientDir: "{{ clientDir }}/silgi",
+    publicDir: "{{ silgi.serverDir }}/public",
+    utilsDir: "{{ silgi.serverDir }}/utils",
+    vfsDir: "{{ silgi.serverDir }}/vfs",
+    typesDir: "{{ silgi.serverDir }}/types"
+  },
+  // Modules
+  _modules: [],
+  modules: [],
+  routeRules: {},
+  // Features
+  // experimental: {},
+  future: {},
+  storage: {},
+  devStorage: {},
+  stub: false,
+  // bundledStorage: [],
+  // publicAssets: [],
+  // serverAssets: [],
+  plugins: [],
+  // tasks: {},
+  // scheduledTasks: {},
+  imports: {
+    exclude: [],
+    dirs: [],
+    presets: [],
+    virtualImports: ["#silgiImports"]
+  },
+  // virtual: {},
+  // compressPublicAssets: false,
+  ignore: [],
+  // Dev
+  dev: false,
+  // devServer: { watch: [] },
+  watchOptions: { ignoreInitial: true },
+  // devProxy: {},
+  // Logging
+  // logging: {
+  //   compressedSizes: true,
+  //   buildSuccess: true,
+  // },
+  // Routing
+  // baseURL: process.env.NITRO_APP_BASE_URL || '/',
+  // handlers: [],
+  // devHandlers: [],
+  // errorHandler: undefined,
+  // Advanced
+  typescript: {
+    strict: false,
+    generateTsConfig: true,
+    // generateRuntimeConfigTypes: true,
+    tsconfigPath: ".silgi/types/silgi.tsconfig.json",
+    tsConfig: {},
+    customConditions: [],
+    generateRuntimeConfigTypes: true,
+    removeFileExtension: false
+  },
+  conditions: [],
+  nodeModulesDirs: [],
+  // hooks: {},
+  commands: {},
+  // Framework
+  framework: {
+    name: "h3",
+    version: ""
+  },
+  extensions: [".js", ".jsx", ".mjs", ".ts", ".tsx", ".vue"],
+  ignoreOptions: void 0
+};
+
+const fallbackCompatibilityDate = "2025-02-04";
+async function resolveCompatibilityOptions(options) {
+  options.compatibilityDate = resolveCompatibilityDatesFromEnv(
+    options.compatibilityDate
+  );
+  if (!options.compatibilityDate.default) {
+    options.compatibilityDate.default = await _resolveDefault(options);
+  }
+}
+let _fallbackInfoShown = false;
+let _promptedUserToUpdate = false;
+async function _resolveDefault(options) {
+  const _todayDate = formatDate(/* @__PURE__ */ new Date());
+  const consola$1 = consola.withTag("silgi");
+  consola$1.warn(`No valid compatibility date is specified.`);
+  const onFallback = () => {
+    if (!_fallbackInfoShown) {
+      consola$1.info(
+        [
+          `Using \`${fallbackCompatibilityDate}\` as fallback.`,
+          `  Please specify compatibility date to avoid unwanted behavior changes:`,
+          `     - Add \`compatibilityDate: '${_todayDate}'\` to the config file.`,
+          `     - Or set \`COMPATIBILITY_DATE=${_todayDate}\` environment variable.`,
+          ``
+        ].join("\n")
+      );
+      _fallbackInfoShown = true;
+    }
+    return fallbackCompatibilityDate;
+  };
+  const shallUpdate = !_promptedUserToUpdate && await consola$1.prompt(
+    `Do you want to auto update config file to set ${colors.cyan(`compatibilityDate: '${_todayDate}'`)}?`,
+    {
+      type: "confirm",
+      default: true
+    }
+  );
+  _promptedUserToUpdate = true;
+  if (!shallUpdate) {
+    return onFallback();
+  }
+  const { updateConfig } = await import('c12/update');
+  const updateResult = await updateConfig({
+    configFile: "silgi.config",
+    cwd: options.rootDir,
+    async onCreate({ configFile }) {
+      const shallCreate = await consola$1.prompt(
+        `Do you want to initialize a new config in ${colors.cyan(relative(".", configFile))}?`,
+        {
+          type: "confirm",
+          default: true
+        }
+      );
+      if (shallCreate !== true) {
+        return false;
+      }
+      return _getDefaultNitroConfig();
+    },
+    async onUpdate(config) {
+      config.compatibilityDate = _todayDate;
+    }
+  }).catch((error) => {
+    consola$1.error(`Failed to update config: ${error.message}`);
+    return null;
+  });
+  if (updateResult?.configFile) {
+    consola$1.success(
+      `Compatibility date set to \`${_todayDate}\` in \`${relative(".", updateResult.configFile)}\``
+    );
+    return _todayDate;
+  }
+  return onFallback();
+}
+function _getDefaultNitroConfig() {
+  return (
+    /* js */
+    `
+import { defineSilgiConfig } from 'silgi/config'
+
+export default defineSilgiConfig({})
+  `
+  );
+}
+
+async function resolveImportsOptions(options) {
+  if (options.imports === false) {
+    return;
+  }
+  options.imports.presets ??= [];
+  options.imports.presets.push(...getSilgiImportsPreset());
+  if (options.preset === "h3") {
+    const h3Exports = await resolveModuleExportNames("h3", {
+      url: import.meta.url
+    });
+    options.imports.presets ??= [];
+    options.imports.presets.push({
+      from: "h3",
+      imports: h3Exports.filter((n) => !/^[A-Z]/.test(n) && n !== "use")
+    });
+  }
+  options.imports.dirs ??= [];
+  options.imports.dirs.push(
+    ...options.scanDirs.map((dir) => join(dir, "utils/**/*"))
+  );
+  if (Array.isArray(options.imports.exclude) && options.imports.exclude.length === 0) {
+    options.imports.exclude.push(/[/\\]\.git[/\\]/);
+    options.imports.exclude.push(options.build.dir);
+    const scanDirsInNodeModules = options.scanDirs.map((dir) => dir.match(/(?<=\/)node_modules\/(.+)$/)?.[1]).filter(Boolean);
+    options.imports.exclude.push(
+      scanDirsInNodeModules.length > 0 ? new RegExp(
+        `node_modules\\/(?!${scanDirsInNodeModules.map((dir) => escapeRE(dir)).join("|")})`
+      ) : /[/\\]node_modules[/\\]/
+    );
+  }
+}
+function getSilgiImportsPreset() {
+  return [
+    // TODO: buraya bizim importlarimiz gelecek.
+    {
+      from: "silgi",
+      imports: [
+        "createShared",
+        "useSilgi",
+        "createService",
+        "createSchema"
+      ]
+    },
+    // {
+    //   from: 'nitropack/runtime',
+    //   imports: ['useRuntimeConfig', 'useAppConfig'],
+    // },
+    // {
+    //   from: 'nitropack/runtime',
+    //   imports: ['defineNitroPlugin', 'nitroPlugin'],
+    // },
+    // {
+    //   from: 'nitropack/runtime/internal/cache',
+    //   imports: [
+    //     'defineCachedFunction',
+    //     'defineCachedEventHandler',
+    //     'cachedFunction',
+    //     'cachedEventHandler',
+    //   ],
+    // },
+    {
+      from: "silgi/core",
+      imports: ["useSilgiStorage"]
+    }
+    // {
+    //   from: 'nitropack/runtime/internal/renderer',
+    //   imports: ['defineRenderHandler'],
+    // },
+    // {
+    //   from: 'nitropack/runtime/internal/meta',
+    //   imports: ['defineRouteMeta'],
+    // },
+    // {
+    //   from: 'nitropack/runtime/internal/route-rules',
+    //   imports: ['getRouteRules'],
+    // },
+    // {
+    //   from: 'nitropack/runtime/internal/context',
+    //   imports: ['useEvent'],
+    // },
+    // {
+    //   from: 'nitropack/runtime/internal/task',
+    //   imports: ['defineTask', 'runTask'],
+    // },
+    // {
+    //   from: 'nitropack/runtime/internal/error/utils',
+    //   imports: ['defineNitroErrorHandler'],
+    // },
+  ];
+}
+
+async function resolvePathOptions(options) {
+  options.rootDir = resolve(options.rootDir || ".");
+  options.workspaceDir = await findWorkspaceDir(options.rootDir).catch(
+    () => options.rootDir
+  );
+  options.srcDir = resolve(options.srcDir || options.rootDir);
+  for (const key of ["srcDir"]) {
+    options[key] = resolve(options.rootDir, options[key]);
+  }
+  options.build.dir = resolve(options.rootDir, options.build.dir);
+  options.build.typesDir = resolveSilgiPath(
+    options.build.typesDir || SilgiCLIDefaults.build.typesDir,
+    options,
+    options.rootDir
+  );
+  if (options.preset === "npm-package") {
+    const packageJsonPath = resolve(options.rootDir, "package.json");
+    const packageJson = await readPackageJSON(packageJsonPath);
+    if (packageJson.name === void 0) {
+      throw new Error("Package name is undefined");
+    }
+    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}/types`] = join(options.rootDir, "src/types");
+  }
+  if (options.stub) {
+    options.alias = {
+      ...options.alias,
+      "silgi/runtime": join(runtimeDir),
+      "#internal/silgi": join(runtimeDir),
+      "silgi/runtime/*": join(runtimeDir, "*"),
+      "#internal/silgi/*": join(runtimeDir, "*")
+    };
+  }
+  options.alias = {
+    ...options.alias,
+    "~/": join(options.srcDir, "/"),
+    "@/": join(options.srcDir, "/"),
+    "~~/": join(options.rootDir, "/"),
+    "@@/": join(options.rootDir, "/")
+  };
+  if (options.preset === "npm-package") {
+    options.alias = {
+      ...options.alias,
+      "#silgi/app/": join(options.build.dir, "/")
+    };
+  }
+  if (options.alias && typeof options.alias === "object") {
+    ((options.typescript.tsConfig ??= {}).compilerOptions ??= {}).paths ??= {};
+    const paths = options.typescript.tsConfig.compilerOptions.paths;
+    for (const [key, value] of Object.entries(options.alias)) {
+      if (typeof paths === "object") {
+        paths[key] = [value];
+      }
+    }
+  }
+  if (options.typescript.tsConfig.compilerOptions?.paths && typeof options.typescript.tsConfig.compilerOptions.paths === "object") {
+    ((options.typescript.tsConfig ??= {}).compilerOptions ??= {}).paths ??= {};
+    const paths = options.typescript.tsConfig.compilerOptions.paths;
+    for (const [key, value] of Object.entries(options.alias)) {
+      if (typeof paths === "object") {
+        paths[key] = [value];
+      }
+    }
+  }
+  options.modulesDir = [resolve(options.rootDir, "node_modules")];
+  options.output.dir = resolveSilgiPath(
+    options.output.dir || SilgiCLIDefaults.output.dir,
+    options,
+    options.rootDir
+  );
+  options.output.publicDir = resolveSilgiPath(
+    options.output.publicDir || SilgiCLIDefaults.output.publicDir,
+    options,
+    options.rootDir
+  );
+  options.output.serverDir = resolveSilgiPath(
+    options.output.serverDir || SilgiCLIDefaults.output.serverDir,
+    options,
+    options.rootDir
+  );
+  options.serverDir = resolveSilgiPath(
+    options.serverDir || SilgiCLIDefaults.serverDir,
+    options,
+    options.rootDir
+  );
+  options.clientDir = resolveSilgiPath(
+    options.clientDir || SilgiCLIDefaults.clientDir,
+    options,
+    options.rootDir
+  );
+  options.silgi.serverDir = resolveSilgiPath(
+    options.silgi.serverDir || SilgiCLIDefaults.silgi.serverDir,
+    options,
+    options.rootDir
+  );
+  options.silgi.clientDir = resolveSilgiPath(
+    options.silgi.clientDir || SilgiCLIDefaults.silgi.clientDir,
+    options,
+    options.rootDir
+  );
+  options.silgi.publicDir = resolveSilgiPath(
+    options.silgi.publicDir || SilgiCLIDefaults.silgi.publicDir,
+    options,
+    options.rootDir
+  );
+  options.silgi.utilsDir = resolveSilgiPath(
+    options.silgi.utilsDir || SilgiCLIDefaults.silgi.utilsDir,
+    options,
+    options.rootDir
+  );
+  options.silgi.vfsDir = resolveSilgiPath(
+    options.silgi.vfsDir || SilgiCLIDefaults.silgi.vfsDir,
+    options,
+    options.rootDir
+  );
+  options.silgi.typesDir = resolveSilgiPath(
+    options.silgi.typesDir || SilgiCLIDefaults.silgi.typesDir,
+    options,
+    options.rootDir
+  );
+  options.nodeModulesDirs.push(resolve(options.workspaceDir, "node_modules"));
+  options.nodeModulesDirs.push(resolve(options.rootDir, "node_modules"));
+  options.nodeModulesDirs.push(resolve(pkgDir, "node_modules"));
+  options.nodeModulesDirs.push(resolve(pkgDir, ".."));
+  options.nodeModulesDirs = [
+    ...new Set(
+      options.nodeModulesDirs.map((dir) => resolve(options.rootDir, dir))
+    )
+  ];
+  options.scanDirs.unshift(options.srcDir);
+  options.scanDirs = options.scanDirs.map(
+    (dir) => resolve(options.srcDir, dir)
+  );
+  options.scanDirs = [...new Set(options.scanDirs)];
+  options.appConfigFiles ??= [];
+  options.appConfigFiles = options.appConfigFiles.map((file) => _tryResolve(resolveSilgiPath(file, options))).filter(Boolean);
+  for (const dir of options.scanDirs) {
+    const configFile = _tryResolve("app.config", dir);
+    if (configFile && !options.appConfigFiles.includes(configFile)) {
+      options.appConfigFiles.push(configFile);
+    }
+  }
+}
+function _tryResolve(path, base = ".", extensions = ["", ".js", ".ts", ".mjs", ".cjs", ".json"]) {
+  path = resolve(base, path);
+  if (existsSync(path)) {
+    return path;
+  }
+  for (const ext of extensions) {
+    const p = path + ext;
+    if (existsSync(p)) {
+      return p;
+    }
+  }
+}
+
+async function resolveStorageOptions(options) {
+  const fsMounts = {
+    root: resolve(options.rootDir),
+    src: resolve(options.srcDir),
+    build: resolve(options.build.dir),
+    cache: resolve(options.build.dir, "cache")
+  };
+  for (const p in fsMounts) {
+    options.devStorage[p] = options.devStorage[p] || {
+      driver: "fs",
+      readOnly: p === "root" || p === "src",
+      base: fsMounts[p]
+    };
+  }
+  if (options.dev && options.storage.data === void 0 && options.devStorage.data === void 0) {
+    options.devStorage.data = {
+      driver: "fs",
+      base: resolve(options.rootDir, ".data/kv")
+    };
+  }
+}
+
+async function resolveURLOptions(options) {
+  options.baseURL = withLeadingSlash(withTrailingSlash(options.baseURL));
+}
+
+const configResolvers = [
+  resolveCompatibilityOptions,
+  resolvePathOptions,
+  resolveImportsOptions,
+  // resolveRouteRulesOptions,
+  // resolveDatabaseOptions,
+  // resolveFetchOptions,
+  // resolveExportConditionsOptions,
+  // resolveRuntimeConfigOptions,
+  // resolveOpenAPIOptions,
+  resolveURLOptions,
+  // resolveAssetsOptions,
+  resolveStorageOptions
+  // resolveErrorOptions,
+];
+async function loadOptions(configOverrides = {}, opts = {}) {
+  const options = await _loadUserConfig(configOverrides, opts);
+  for (const resolver of configResolvers) {
+    await resolver(options);
+  }
+  return options;
+}
+async function _loadUserConfig(configOverrides = {}, opts = {}) {
+  const presetOverride = configOverrides.preset || process.env.SILGI_PRESET;
+  if (configOverrides.dev) ;
+  configOverrides = klona(configOverrides);
+  globalThis.defineSilgiConfig = globalThis.defineSilgiConfig || ((c) => c);
+  let compatibilityDate = configOverrides.compatibilityDate || opts.compatibilityDate || (process.env.SILGI_COMPATIBILITY_DATE || process.env.SERVER_COMPATIBILITY_DATE || process.env.COMPATIBILITY_DATE);
+  const { resolvePreset } = await import('silgi/presets');
+  const loadedConfig = await (opts.watch ? watchConfig : loadConfig)({
+    name: "silgi",
+    cwd: configOverrides.rootDir,
+    dotenv: configOverrides.dev,
+    extend: { extendKey: ["extends", "preset"] },
+    overrides: {
+      ...configOverrides,
+      preset: presetOverride
+    },
+    async defaultConfig({ configs }) {
+      const getConf = (key) => configs.main?.[key] ?? configs.rc?.[key] ?? configs.packageJson?.[key];
+      if (!compatibilityDate) {
+        compatibilityDate = getConf("compatibilityDate");
+      }
+      return {
+        // typescript: {
+        //   generateRuntimeConfigTypes:
+        //     !framework?.name || framework.name === 'nitro',
+        // },
+        preset: presetOverride || (await resolvePreset("", {
+          static: getConf("static"),
+          compatibilityDate: compatibilityDate || fallbackCompatibilityDate
+        }))?._meta?.name
+      };
+    },
+    defaults: SilgiCLIDefaults,
+    jitiOptions: {
+      alias: {
+        "silgi": "silgi/config",
+        "silgi/config": "silgi/config"
+      }
+    },
+    async resolve(id) {
+      const preset = await resolvePreset(id, {
+        static: configOverrides.static,
+        compatibilityDate: compatibilityDate || fallbackCompatibilityDate
+      });
+      if (preset) {
+        return {
+          config: klona(preset)
+        };
+      }
+    },
+    ...opts.c12
+  });
+  delete globalThis.defineSilgiConfig;
+  const options = klona(loadedConfig.config);
+  options._config = configOverrides;
+  options._c12 = loadedConfig;
+  const _presetName = (loadedConfig.layers || []).find((l) => l.config?._meta?.name)?.config?._meta?.name || presetOverride;
+  options.preset = _presetName;
+  options.compatibilityDate = resolveCompatibilityDates(
+    compatibilityDate,
+    options.compatibilityDate
+  );
+  return options;
+}
 
 function getDirectory(p) {
   try {
@@ -193,4 +754,4 @@ async function silgiGenerateType(silgi) {
   };
 }
 
-export { silgiGenerateType as s };
+export { loadOptions as l, silgiGenerateType as s };

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.19.10";
+const version = "0.19.11";
 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.10";
+const version = "0.19.11";
 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.10",
+  "version": "0.19.11",
   "private": false,
   "sideEffects": false,
   "exports": {