silgi 0.29.36 → 0.29.37

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.29.36";
+const version = "0.29.37";
 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, relative, isAbsolute, basename, extname } from 'pathe';
-import { hasSilgiModule, addTemplate, normalizeTemplate, useLogger, genEnsureSafeVar, baseHeaderBannerComment, addImports, hash, toArray, writeFile, relativeWithDot, isDirectory, isPresents, addCoreFile, resolveAlias as resolveAlias$1, directoryToURL, hasError, parseServices, resolveSilgiPath } from 'silgi/kit';
+import { hasSilgiModule, addTemplate, normalizeTemplate, useLogger, genEnsureSafeVar, baseHeaderBannerComment, addImports, hash, toArray, writeFile, relativeWithDot, isDirectory, isPresents, addCoreFile, resolveAlias as resolveAlias$1, directoryToURL, hasError, removeExtension, parseServices, resolveSilgiPath } from 'silgi/kit';
 import { mkdirSync, existsSync, writeFileSync, promises, readFileSync } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
 import { genAugmentation, genObjectFromRawEntries, genImport, genTypeImport, genObjectFromRaw, genObjectFromValues } from 'knitwork';
@@ -1860,10 +1860,8 @@ async function scanExportFile(silgi) {
           if (type === "schema") {
             options.schemas.push(_name);
           }
-          const relativePath = relativeWithDot(silgi.options.silgi.serverDir, path);
-          const isExtension = silgi.options.typescript.removeFileExtension ? relativePath.replace(/\.+$/, "") : relativePath;
           options.addImportItem({
-            specifier: isExtension,
+            specifier: removeExtension(relativeWithDot(silgi.options.silgi.serverDir, path)),
             imports: [
               {
                 name: exportName,
@@ -1890,8 +1888,6 @@ async function scanExportFile(silgi) {
               value: _name
             });
           }
-          const relativePath = relativeWithDot(silgi.options.silgi.serverDir, path);
-          const isExtension = silgi.options.typescript.removeFileExtension ? relativePath.replace(/\.+$/, "") : relativePath;
           options.addImportItem({
             imports: [
               {
@@ -1899,7 +1895,7 @@ async function scanExportFile(silgi) {
                 as: _name
               }
             ],
-            specifier: isExtension
+            specifier: removeExtension(relativeWithDot(silgi.options.build.typesDir, path))
           });
         }
       });

package/dist/kit/index.d.mts

@@ -313,6 +313,7 @@ declare const baseHeaderBannerComment: string[];
 declare function processFilePath(src: string): string;
 declare function isPresents(names: PresetName[]): boolean;
 declare function isRuntimePresents(names: PresetName[]): boolean;
+declare function removeExtension(filePath: string): string;
 
-export { MODE_RE, MigrationStatus, addCommands, addCoreFile, addImports, 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, isPresents, isRuntimePresents, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
+export { MODE_RE, MigrationStatus, addCommands, addCoreFile, addImports, 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, isPresents, isRuntimePresents, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, removeExtension, 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,5 +1,5 @@
 import { u as useSilgiCLI$1 } from '../_chunks/silgiApp.mjs';
-import { relative, resolve, dirname, join, normalize, isAbsolute, parse, basename } from 'pathe';
+import { relative, extname, resolve, dirname, join, normalize, isAbsolute, parse, basename } from 'pathe';
 import { useSilgiCLI, useSilgi, tryUseSilgiCLI } from 'silgi';
 import { toArray as toArray$1, hash as hash$2 } from 'silgi/kit';
 import { execSync } from 'node:child_process';
@@ -68,6 +68,14 @@ function isRuntimePresents(names) {
   const silgi = useSilgi();
   return names.includes(silgi.options.present);
 }
+function removeExtension(filePath) {
+  const silgi = useSilgiCLI();
+  if (silgi.options.typescript.removeFileExtension) {
+    const ext = extname(filePath);
+    return ext ? filePath.slice(0, -ext.length) : filePath;
+  }
+  return filePath;
+}
 
 async function addCommands(data) {
   useSilgiCLI$1().hook("prepare:commands", (commads) => {
@@ -1045,4 +1053,4 @@ function isValidIp(ip) {
   return false;
 }
 
-export { MODE_RE, MigrationStatus, addCommands, addCoreFile, addImports, 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, isPresents, isRuntimePresents, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };
+export { MODE_RE, MigrationStatus, addCommands, addCoreFile, addImports, 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, isPresents, isRuntimePresents, listMigrations, migrationDown, migrationUp, normalizeTemplate, parseServices, prettyPath, processFilePath, relativeWithDot, removeExtension, resolveAlias, resolvePath, resolveSilgiModule, resolveSilgiPath, serviceParseModule, toArray, tryResolveModule, useLogger, useRequest, useResponse, writeFile };

package/package.json

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