silgi 0.16.5 → 0.16.6

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.16.5";
+const version = "0.16.6";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/cli/prepare.mjs

@@ -40,46 +40,90 @@ import 'pathe/utils';
 import 'untyped';
 import './types.mjs';
 
-function serializeToString(obj, indent = 0) {
-  const spacing = " ".repeat(indent);
-  const innerSpacing = " ".repeat(indent + 4);
-  if (obj === null || obj === void 0)
-    return "null";
-  if (typeof obj === "function")
-    return obj.toString();
-  if (typeof obj !== "object")
-    return JSON.stringify(obj);
-  if (Array.isArray(obj)) {
-    if (obj.length === 0)
-      return "[]";
-    const items = obj.map((item) => serializeToString(item, indent + 4));
-    return `[
-${innerSpacing}${items.join(`,
-${innerSpacing}`)}
-${spacing}]`;
+function serializeRules(rules, options = {}) {
+  try {
+    const config = {
+      indent: 2,
+      functionIndent: 2,
+      // Daha tutarlı indentasyon için değiştirildi
+      ...options
+    };
+    const uniqueId = Date.now().toString(36) + Math.random().toString(36).substring(2, 7);
+    const FUNCTION_MARKER = `__SILGI_FUNCTION_${uniqueId}_`;
+    const FUNCTION_MARKER_END = `_FUNCTION_END_${uniqueId}__`;
+    const safeStringify = (obj) => {
+      const cache = [];
+      const serialized2 = JSON.stringify(obj, (key, value) => {
+        if (typeof value === "function") {
+          return `${FUNCTION_MARKER}${value.toString()}${FUNCTION_MARKER_END}`;
+        }
+        if (typeof value === "object" && value !== null) {
+          if (cache.includes(value)) {
+            return "[Circular Reference]";
+          }
+          cache.push(value);
+        }
+        return value;
+      }, config.indent);
+      return serialized2;
+    };
+    const serialized = safeStringify(rules);
+    const getIndentLevel = (matchIndex) => {
+      const beforeMatch = serialized.substring(0, matchIndex);
+      const lastNewline = beforeMatch.lastIndexOf("\n");
+      if (lastNewline === -1)
+        return 0;
+      const lineStart = beforeMatch.substring(lastNewline + 1);
+      return lineStart.match(/^\s*/)?.[0].length ?? 0;
+    };
+    const result = serialized.replace(
+      new RegExp(`"${FUNCTION_MARKER}(.*?)${FUNCTION_MARKER_END}"`, "gs"),
+      (match, fnContent, offset) => {
+        const baseIndent = getIndentLevel(offset);
+        const functionBodyIndent = " ".repeat(baseIndent + config.functionIndent);
+        return fnContent.replace(/\\n/g, "\n").replace(/\\"/g, '"').replace(/\\\\/g, "\\").split("\n").map((line, i) => {
+          if (i === 0)
+            return line;
+          const trimmedLine = line.trimStart();
+          return trimmedLine ? `${functionBodyIndent}${trimmedLine}` : "";
+        }).filter(Boolean).join("\n");
+      }
+    );
+    return result;
+  } catch (error) {
+    console.error("Error serializing rules:", error);
+    return JSON.stringify(rules, null, 2);
   }
-  const entries = Object.entries(obj);
-  if (entries.length === 0)
-    return "{}";
-  const props = entries.map(
-    ([key, value]) => `${innerSpacing}"${key}": ${serializeToString(value, indent + 4)}`
-  );
-  return `{
-${props.join(",\n")}
-${spacing}}`;
 }
 async function prepareBuild(silgi) {
-  const exportedRules = silgi.routeRules.exportRules();
-  const serialized = serializeToString(exportedRules);
-  const content = `/* eslint-disable */
+  try {
+    if (!silgi?.routeRules?.exportRules) {
+      throw new Error("Invalid silgi configuration: routeRules or exportRules is undefined");
+    }
+    const exportedRules = silgi.routeRules.exportRules();
+    if (!exportedRules || typeof exportedRules !== "object") {
+      throw new Error("No valid route rules to export");
+    }
+    const serialized = serializeRules(exportedRules);
+    const content = `/* eslint-disable */
 // @ts-nocheck
-// This file is auto-generated at build time
+// This file is auto-generated at build time by Silgi
 // Contains route rules with preserved functions
+// Generated: ${(/* @__PURE__ */ new Date()).toISOString()}
 
 export const routeRules = ${serialized}
 `;
-  const file = join(silgi.options.silgi.serverDir, "rules.ts");
-  await writeFile(file, content);
+    const serverDir = silgi.options.silgi.serverDir;
+    if (!serverDir) {
+      throw new Error("Server directory not defined in configuration");
+    }
+    const file = join(serverDir, "rules.ts");
+    await writeFile(file, content);
+    console.log(`\u2705 Route rules written to ${file}`);
+  } catch (error) {
+    console.error("\u274C Failed to prepare build:", error instanceof Error ? error.message : String(error));
+    throw error;
+  }
 }
 
 const prepare = defineCommand({

package/dist/kit/index.mjs

@@ -201,13 +201,19 @@ const parseGraphQLServices = serviceParseModule(({
 const parseRouteRules = serviceParseModule(({
   node,
   basePath,
-  silgi
+  silgi,
+  pathLength
 }) => {
   const routeRules = node.routeRules;
   if (!routeRules)
     return;
   let removeMethod = "";
   removeMethod = withLeadingSlash(basePath);
+  if (pathLength === 1 || pathLength === 2 || pathLength === 3) {
+    if (routeRules.doubleSplat === void 0) {
+      routeRules.doubleSplat = true;
+    }
+  }
   if (routeRules.splat)
     removeMethod = `${removeMethod}/*`;
   else if (routeRules.doubleSplat)
@@ -228,7 +234,7 @@ function parseServices(silgi, pathLength = [4, 3, 2, 1], servicesObject, current
     if (pathLengths.includes(path.length)) {
       const basePath = path.join("/");
       for (const handler of silgi.options.serviceParseModules) {
-        handler({ node, basePath, silgi, modulesURIs });
+        handler({ node, basePath, silgi, modulesURIs, pathLength: path.length });
       }
     }
     for (const key in node) {

package/dist/meta/index.d.mts

@@ -1,4 +1,4 @@
-const version = "0.16.5";
+const version = "0.16.6";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/meta/index.d.ts

@@ -1,4 +1,4 @@
-const version = "0.16.5";
+const version = "0.16.6";
 const peerDependencies = {
 	"@fastify/deepmerge": "^2.0.2",
 	"@nuxt/kit": "^3.15.3",

package/dist/types/index.d.mts

@@ -826,7 +826,7 @@ interface SilgiRuntimeRouteRulesConfig {
 /**
  * Interface for the object returned by createRouteRules
  */
-interface RouteRules<T extends Record<string, any> = DefaultRouteRules> {
+interface RouteRules {
     readonly rules: Record<string, DefaultRouteConfig>;
     readonly mergedRules: Record<string, DefaultRouteConfig>;
     importRules: (config: Record<string, DefaultRouteConfig>) => void;
@@ -1122,6 +1122,7 @@ interface ServiceParse {
     basePath: string;
     silgi: SilgiCLI;
     modulesURIs: Record<string, Record<string, any>>;
+    pathLength: number;
 }
 interface ServiceParseModule {
     (params: ServiceParse): Awaited<void> | void;

package/dist/types/index.d.ts

@@ -826,7 +826,7 @@ interface SilgiRuntimeRouteRulesConfig {
 /**
  * Interface for the object returned by createRouteRules
  */
-interface RouteRules<T extends Record<string, any> = DefaultRouteRules> {
+interface RouteRules {
     readonly rules: Record<string, DefaultRouteConfig>;
     readonly mergedRules: Record<string, DefaultRouteConfig>;
     importRules: (config: Record<string, DefaultRouteConfig>) => void;
@@ -1122,6 +1122,7 @@ interface ServiceParse {
     basePath: string;
     silgi: SilgiCLI;
     modulesURIs: Record<string, Record<string, any>>;
+    pathLength: number;
 }
 interface ServiceParseModule {
     (params: ServiceParse): Awaited<void> | void;

package/package.json

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