silgi 0.36.15 → 0.36.17

package/dist/cli/build.mjs

@@ -1118,12 +1118,19 @@ async function prepareScanFile(silgi) {
   ];
   const generateExport = (name, items, defaultEmpty = "{}") => {
     const hasItems = items.length > 0;
-    return [
-      `export const ${name} = ${hasItems ? "deepMergeObjects([" : defaultEmpty}`,
-      ...items.map((item) => `  ${item},`),
-      hasItems ? "])" : defaultEmpty === "{}" ? "}" : "",
-      ""
-    ];
+    if (hasItems) {
+      return [
+        `export const ${name} = deepMergeObjects([`,
+        ...items.map((item) => `  ${item},`),
+        "])",
+        ""
+      ];
+    } else {
+      return [
+        `export const ${name} = ${defaultEmpty}`,
+        ""
+      ];
+    }
   };
   const importData = [
     "",

package/dist/cli/index.mjs

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

package/dist/kit/index.d.mts

@@ -225,7 +225,7 @@ declare function defineSilgiModule<TOptions extends ModuleOptionsCustom>(): {
 };
 
 declare function prettyPath(p: string, highlight?: boolean): string;
-declare function resolveSilgiPath(path: string, silgiOptions: SilgiCLI["options"], base?: string): string;
+declare function resolveSilgiPath(path: string, silgiCLIOptions: SilgiCLI['options'], base?: string): string;
 
 declare function defineSilgiPreset<P extends SilgiPreset, M extends SilgiPresetMeta>(preset: P, meta?: M): P & {
     _meta: SilgiPresetMeta;

package/dist/kit/index.mjs

@@ -224,20 +224,20 @@ function prettyPath(p, highlight = true) {
   p = relative(process.cwd(), p);
   return highlight ? colors.cyan(p) : p;
 }
-function resolveSilgiPath(path, silgiOptions, base) {
+function resolveSilgiPath(path, silgiCLIOptions, base) {
   if (typeof path !== "string") {
-    throw new TypeError("Invalid path: " + path);
+    throw new TypeError(`Invalid path: ${path}`);
   }
-  path = _compilePathTemplate(path)(silgiOptions);
-  for (const base2 in silgiOptions.alias) {
+  path = _compilePathTemplate(path)(silgiCLIOptions);
+  for (const base2 in silgiCLIOptions.alias) {
     if (path.startsWith(base2)) {
-      path = silgiOptions.alias[base2] + path.slice(base2.length);
+      path = silgiCLIOptions.alias[base2] + path.slice(base2.length);
     }
   }
-  return resolve(base || silgiOptions.srcDir, path);
+  return resolve(base || silgiCLIOptions.srcDir, path);
 }
 function _compilePathTemplate(contents) {
-  return (params) => contents.replace(/{{ ?([\w.]+) ?}}/g, (_, match) => {
+  return (params) => contents.replace(/\{\{ ?([\w.]+) ?\}\}/g, (_, match) => {
     const val = getProperty(params, match);
     if (!val) {
       consola.warn(

package/dist/presets/next/preset.mjs

@@ -1,8 +1,8 @@
 import { addNPMPackage, defineSilgiPreset } from "silgi/kit";
 const next = defineSilgiPreset(
   {
-    serverDir: "{{ rootDir }}/src/server",
-    srcDir: "{{ rootDir }}/src",
+    serverDir: "src/server",
+    srcDir: "src",
     envOptions: {
       prefix: "NEXT_",
       altPrefix: "SILGI_"

package/package.json

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