update 6 files and create 1 file

Author: Nano191225

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nano191225/scriptup",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "description": "ScriptAPI version updater for Minecraft Bedrock",
     "license": "MIT",
     "author": "Nano191225",

src/commands/build.ts

@@ -23,7 +23,7 @@ export async function build(options: BuildCommandOptions = {}): Promise<void> {
     }
 
     const userConfig = await loadTsdownConfig(path.resolve("tsdown.config.ts"));
-    const sourceEntry = getSourceEntry(userConfig);
+    const sourceEntry = getSourceEntry("src", userConfig);
     if (!sourceEntry) {
         logger.error("Source entry not found. Expected src/main.ts, src/index.ts, or tsdown.config.ts entry.");
         process.exit(1);
@@ -85,17 +85,19 @@ function ensureBuildOutput(outputEntry: string): void {
     }
 }
 
-function getSourceEntry(userConfig: UserConfig): string | null {
-    const mainEntry = path.resolve("src/main.ts");
+function getSourceEntry(directory: string, userConfig?: UserConfig): string | null {
+    const mainEntry = path.resolve(directory, "main.ts");
     if (fs.existsSync(mainEntry)) {
         return mainEntry;
     }
 
-    const indexEntry = path.resolve("src/index.ts");
+    const indexEntry = path.resolve(directory, "index.ts");
     if (fs.existsSync(indexEntry)) {
         return indexEntry;
     }
 
+    if (!userConfig) return null;
+
     const configuredEntry = resolveConfiguredEntry(userConfig.entry);
     if (!configuredEntry) {
         return null;
@@ -148,27 +150,31 @@ async function loadTsdownConfig(configPath: string): Promise<UserConfig> {
 }
 
 async function buildLocalPackageDist(): Promise<void> {
-    const packageEntries = getPackageTypeScriptEntries(path.resolve("package"));
-    if (packageEntries.length === 0) {
+    // const packageEntries = getPackageTypeScriptEntries(path.resolve("package"));
+    const sourceEntry = getSourceEntry("package");
+    if (!sourceEntry) {
         return;
     }
 
     logger.info("Building local package sources into dist/... ");
 
     const packageBuildConfig: InlineConfig = {
         config: false,
-        entry: packageEntries.map((entry) => path.relative(process.cwd(), entry)),
+        entry: path.relative(process.cwd(), sourceEntry),
         outDir: path.relative(process.cwd(), path.resolve("dist")),
         format: "esm" as const,
         target: "es2024",
         platform: "neutral" as const,
         clean: true,
         tsconfig: path.relative(process.cwd(), path.resolve("tsconfig.json")),
         outExtensions: () => ({ js: ".js" }),
-        unbundle: true,
         dts: true,
+        unbundle: false,
         deps: {
-            neverBundle: /^@minecraft\/(?!math(?:\/|$)|vanilla-data(?:\/|$))/,
+            // alwaysBundle: "**/*",
+            // neverBundle: /^@minecraft\/(?!math(?:\/|$)|vanilla-data(?:\/|$))/,
+            // neverBundle: "**/*",
+            // onlyBundle: false,
         }
     };
 

src/commands/new.ts

@@ -24,6 +24,7 @@ export async function createNewProject(projectName: string, options: NewCommandO
     await scaffoldProject({
         targetDir,
         projectName,
+        directoryName,
         lib: options.lib,
         workflow: options.workflow,
     });
@@ -56,11 +57,11 @@ function resolveProjectTargetDir(projectName: string, options: NewCommandOptions
 }
 
 function resolveProjectDirectoryName(projectName: string): string {
-    const replacedSeparators = projectName.trim().replace(/[\\/]+/g, "$");
-    const sanitized = replacedSeparators.replace(/[^A-Za-z0-9@$-_.]/g, "");
+    const replacedSeparators = projectName.trim().replace(/[\\/]+/g, "-");
+    const sanitized = replacedSeparators.replace(/[^A-Za-z0-9-_]/g, "");
 
     if (sanitized.length === 0) {
-        logger.error("Project name is empty after sanitizing. Use at least one of A-Z, a-z, 0-9, @, $, -, _, or .");
+        logger.error("Project name is empty after sanitizing. Use at least one of A-Z, a-z, 0-9, -, or _.");
         process.exit(1);
     }
 

src/constants.ts

@@ -1 +1 @@
-export const VERSION = "1.3.1";
+export const VERSION = "1.3.2";

src/utils/logger.ts

@@ -18,4 +18,4 @@ export function error(message: string): void {
 
 export function done(message: string): void {
     console.log(`${chalk.green("[DONE]")} ${message}`);
-}
+}

src/utils/scaffold.ts

@@ -6,12 +6,14 @@ import { Manifest, ManifestDependency, ManifestVersion } from "./manifest.js";
 import { extractMcVersion, extractModuleVersion, getVersions } from "./versions.js";
 import * as logger from "./logger.js";
 import { VERSION } from "../constants.js";
+import { getUsername } from "./username.js";
 
 const DEFAULT_ENGINE_VERSION: [number, number, number] | string = "1.20.0";
 
 interface ScaffoldOptions {
     targetDir: string;
     projectName?: string;
+    directoryName?: string;
     lib?: boolean;
     workflow?: boolean;
 }
@@ -25,13 +27,14 @@ interface ResolvedDependencyInfo {
 export async function scaffoldProject(options: ScaffoldOptions): Promise<void> {
     const targetDir = path.resolve(options.targetDir);
     const projectName = options.projectName?.trim() || path.basename(targetDir);
+    const directoryName = options.directoryName?.trim() || projectName;
     const includeLibraryTemplate = options.lib === true;
     const includeWorkflow = options.workflow !== false;
 
     fs.mkdirSync(targetDir, { recursive: true });
 
     const dependencyInfo = await resolveDependencyInfo();
-    const files = createTemplateFiles(projectName, dependencyInfo, includeWorkflow, includeLibraryTemplate);
+    const files = createTemplateFiles(projectName, directoryName, dependencyInfo, includeWorkflow, includeLibraryTemplate);
 
     let createdCount = 0;
 
@@ -135,13 +138,14 @@ async function resolveDependencyInfo(): Promise<ResolvedDependencyInfo> {
 
 function createTemplateFiles(
     projectName: string,
+    directoryName: string,
     dependencyInfo: ResolvedDependencyInfo,
     includeWorkflow: boolean,
     includeLibraryTemplate: boolean,
 ): Record<string, string> {
     const libraryPackageName = includeLibraryTemplate ? resolveLibraryPackageName(projectName) : null;
     const manifest = createManifest(projectName, dependencyInfo.engineVersion, dependencyInfo.dependencies, includeLibraryTemplate);
-    const packageJson = createPackageJson(projectName, dependencyInfo.packageDependencies, includeLibraryTemplate, libraryPackageName);
+    const packageJson = createPackageJson(projectName, directoryName, dependencyInfo.packageDependencies, includeLibraryTemplate, libraryPackageName);
 
     const files: Record<string, string> = {
         ".gitignore": "node_modules/\nscripts\ndist\n*.mcpack\n*.mcaddon\n",
@@ -216,6 +220,7 @@ function createManifest(
 
 function createPackageJson(
     projectName: string,
+    directoryName: string,
     dependencies: Record<string, string>,
     includeLibraryTemplate: boolean,
     libraryPackageName: string | null,
@@ -247,7 +252,8 @@ function createPackageJson(
                   },
                   main: "./dist/main.js",
                   types: "./dist/main.d.ts",
-                  prepublishOnly: "scriptup build --release && node .github/workflows/ensure-dts-export.js",
+                prepublishOnly: "scriptup build --release && node .github/workflows/ensure-dts-export.js",
+                  repository: `https://github.com/${getUsername() ?? "{{your-username}}"}/${directoryName}.git`,
               }
             : {}),
         scripts: {
@@ -637,22 +643,7 @@ function resolveLibraryPackageName(projectName: string): string {
 
 function createLicense(): string {
     const year = new Date().getFullYear();
-    let author = "{{author}}";
-    try {
-        const gitNameResult = spawnSync("git", ["config", "user.name"], {
-            encoding: "utf-8",
-            shell: true,
-        });
-        if (gitNameResult.status === 0) {
-            const gitName = gitNameResult.stdout.trim();
-            if (gitName) {
-                author = gitName;
-            }
-        }
-    } catch (error) {
-        logger.warn(`Failed to get git user.name: ${error instanceof Error ? error.message : String(error)}`);
-        logger.warn("Using placeholder author name in LICENSE.");
-    }
+    const author = getUsername() || "{{author}}";
 
     return `MIT License
 
@@ -681,7 +672,7 @@ function normalizePackageName(projectName: string): string {
     const normalized = projectName
         .trim()
         .toLowerCase()
-        .replace(/[^a-z0-9-_\s]/g, "")
+        .replace(/[^a-z0-9-@\/_\s]/g, "")
         .replace(/\s+/g, "-")
         .replace(/-+/g, "-")
         .replace(/^-|-$/g, "");

src/utils/username.ts

@@ -0,0 +1,14 @@
+import { spawnSync } from "node:child_process";
+
+export function getUsername(): string | undefined {
+    try {
+        const gitNameResult = spawnSync("git", ["config", "user.name"], {
+            encoding: "utf-8",
+            shell: true,
+        });
+        if (gitNameResult.status === 0) {
+            const gitName = gitNameResult.stdout.trim();
+            if (gitName) return gitName;
+        }
+    } catch {}
+}