silgi 0.23.0 → 0.23.2

package/dist/_chunks/index.mjs

@@ -1,4 +1,4 @@
-const version = "0.23.0";
+const version = "0.23.2";
 const peerDependencies = {
 	"@fastify/deepmerge": "^3.0.0",
 	"@nuxt/kit": "^3.15.3",

package/dist/cli/prepare.mjs

@@ -1,8 +1,8 @@
 import { defineCommand, runCommand } from 'citty';
 import { join, resolve, relative, dirname, basename, extname, isAbsolute } from 'pathe';
 import { peerDependencies, version } from 'silgi/meta';
-import { genObjectFromRawEntries, genObjectFromRaw, genObjectFromValues, genString } from 'knitwork';
-import { writeFile, relativeWithDot, hash, resolveAlias, directoryToURL, addTemplate, hasError, parseServices, useSilgiRuntimeConfig, normalizeTemplate, useLogger, initRuntimeConfig, resolveSilgiPath, isDirectory } from 'silgi/kit';
+import { genObjectFromRawEntries, genObjectFromRaw, genObjectFromValues } from 'knitwork';
+import { writeFile, relativeWithDot, hash, resolveAlias, directoryToURL, addTemplate, hasError, parseServices, useSilgiRuntimeConfig, normalizeTemplate, useLogger, initRuntimeConfig, 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';
@@ -861,6 +861,13 @@ function resolveGroupSyntax(group) {
   return groups;
 }
 
+const safeFiles = [
+  "silgi/configs",
+  "silgi/core",
+  "silgi/rules",
+  "silgi/scan",
+  "silgi/vfs"
+];
 class SchemaParser {
   options = {
     debug: false
@@ -887,6 +894,8 @@ class SchemaParser {
   parseVariableDeclaration(ast, path) {
     const silgi = useSilgiCLI();
     if (ast.program.body.length === 0) {
+      if (safeFiles.find((i) => path.includes(i)))
+        return [];
       silgi.errors.push({
         type: "Parser",
         path
@@ -899,6 +908,8 @@ class SchemaParser {
   parseTSInterfaceDeclaration(ast, path = "") {
     const silgi = useSilgiCLI();
     if (ast.program.body.length === 0) {
+      if (safeFiles.find((i) => path.includes(i)))
+        return [];
       silgi.errors.push({
         type: "Parser",
         path
@@ -1504,6 +1515,9 @@ async function generateApp(app, options = {}) {
     }
     if (template.modified && template.write) {
       dirs.add(dirname(fullPath));
+      if (template.skipIfExists && existsSync(fullPath)) {
+        return;
+      }
       writes.push(() => writeFileSync(fullPath, contents, "utf8"));
     }
   }
@@ -1713,19 +1727,6 @@ async function createSilgiCLI(config = {}, opts = {}) {
   return silgi;
 }
 
-const reservedCode = /* @__PURE__ */ new Set([
-  "process",
-  "global",
-  "Buffer",
-  "runtime",
-  "runtimeConfig"
-]);
-function genEnsureSafeVar(name) {
-  if (reservedCode.has(name)) {
-    return name;
-  }
-  return genString(name);
-}
 async function prepareConfigs(silgi) {
   const _data = {
     runtimeConfig: {}

package/dist/kit/index.d.mts

@@ -18,6 +18,9 @@ declare function tryResolveModule(id: string, url?: string | string[]): Promise<
 declare function writeFile(file: string, contents: Buffer | string, log?: boolean): Promise<void>;
 declare function isDirectory(path: string): Promise<boolean>;
 
+declare function genEnsureSafeVar(name: string | any): string;
+declare function getAllEntries(obj: object): [string, any][];
+
 declare function hash(data: any): string;
 
 declare function isNuxt(): boolean;
@@ -153,4 +156,4 @@ declare const MODE_RE: RegExp;
 declare function hasSilgiModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 
-export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, useSilgiRuntimeConfig, writeFile };
+export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, useSilgiRuntimeConfig, writeFile };

package/dist/kit/index.d.ts

@@ -18,6 +18,9 @@ declare function tryResolveModule(id: string, url?: string | string[]): Promise<
 declare function writeFile(file: string, contents: Buffer | string, log?: boolean): Promise<void>;
 declare function isDirectory(path: string): Promise<boolean>;
 
+declare function genEnsureSafeVar(name: string | any): string;
+declare function getAllEntries(obj: object): [string, any][];
+
 declare function hash(data: any): string;
 
 declare function isNuxt(): boolean;
@@ -153,4 +156,4 @@ declare const MODE_RE: RegExp;
 declare function hasSilgiModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 declare function hasInstalledModule(moduleKey: string, silgi?: SilgiCLI): boolean;
 
-export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, useSilgiRuntimeConfig, writeFile };
+export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, useSilgiRuntimeConfig, writeFile };

package/dist/kit/index.mjs

@@ -6,6 +6,7 @@ import consola, { consola as consola$1 } from 'consola';
 import { relative, resolve, dirname, normalize, isAbsolute, join, parse, basename } from 'pathe';
 import { colors } from 'consola/utils';
 import { getProperty } from 'dot-prop';
+import { genString, genObjectFromRaw, genObjectFromValues, genObjectFromRawEntries } from 'knitwork';
 import { hash as hash$1 } from 'ohash';
 import { camelCase, snakeCase } from 'scule';
 import { defu } from 'defu';
@@ -88,6 +89,47 @@ async function isDirectory$1(path) {
   }
 }
 
+const reservedCode = /* @__PURE__ */ new Set([
+  "process",
+  "global",
+  "runtime",
+  "runtimeConfig"
+]);
+function genEnsureSafeVar(name) {
+  if (typeof name !== "string") {
+    return genString(name);
+  }
+  for (const reserved of reservedCode) {
+    if (name === reserved || name.startsWith(`${reserved}.`)) {
+      return name;
+    }
+  }
+  return genString(name);
+}
+function getAllEntries(obj) {
+  return Object.entries(obj).map(([
+    key,
+    value
+  ]) => {
+    if (typeof value === "function") {
+      return [key, genObjectFromRaw(value)];
+    }
+    if (typeof value === "string") {
+      return [key, genEnsureSafeVar(value)];
+    }
+    if (typeof value === "object" && value !== null) {
+      if (Array.isArray(value)) {
+        return [key, genObjectFromValues(value.map(
+          (item) => typeof item === "object" && item !== null ? genObjectFromRawEntries(getAllEntries(item)) : item
+        ))];
+      } else {
+        return [key, genObjectFromRawEntries(getAllEntries(value))];
+      }
+    }
+    return [key, value];
+  });
+}
+
 function hash(data) {
   return camelCase(hash$1(data));
 }
@@ -570,4 +612,4 @@ function isValidIp(ip) {
   return false;
 }
 
-export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, useSilgiRuntimeConfig, writeFile };
+export { MODE_RE, addTemplate, applyEnv, createResolver, defineSilgiModule, defineSilgiPreset, directoryToURL, filterInPlace, genEnsureSafeVar, getAllEntries, getIpAddress, hasError, hasInstalledModule, hasSilgiModule, hash, initRuntimeConfig, ipAddress, isDirectory$1 as isDirectory, isH3, isNitro, isNuxt, normalizeTemplate, parseServices, prettyPath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, useSilgiRuntimeConfig, writeFile };

package/dist/types/index.d.mts

@@ -143,6 +143,7 @@ interface SilgiTemplate<Options = TemplateDefaultOptions> {
     }) => string | Promise<string>;
     /** Write to filesystem */
     write?: boolean;
+    skipIfExists?: boolean;
 }
 interface ResolvedSilgiTemplate<Options = TemplateDefaultOptions> extends SilgiTemplate<Options> {
     filename: string;

package/dist/types/index.d.ts

@@ -143,6 +143,7 @@ interface SilgiTemplate<Options = TemplateDefaultOptions> {
     }) => string | Promise<string>;
     /** Write to filesystem */
     write?: boolean;
+    skipIfExists?: boolean;
 }
 interface ResolvedSilgiTemplate<Options = TemplateDefaultOptions> extends SilgiTemplate<Options> {
     filename: string;

package/package.json

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