Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/actions/dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ const showInfo = () => {
console.log()
}



const send = async (config: Config, dayNum: number, part: 1 | 2) => {
console.log(`\nPart ${part}:`)
const dayData =
Expand Down
56 changes: 35 additions & 21 deletions src/actions/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,34 @@ const init = async () => {

const setup: Setup = await initPrompt()

const installCmd =
setup.packageManager === "npm"
? "npm i"
: setup.packageManager === "yarn"
? "yarn"
: "pnpm install"

const formatCmd =
setup.packageManager === "npm"
? "npm run format"
: setup.packageManager === "yarn"
? "yarn format"
: "pnpm format"

const startCmd =
setup.packageManager === "npm"
? "npm start"
: setup.packageManager === "yarn"
? "yarn start"
: "pnpm start"
const packageManagers = {
npm: {
install: "npm i",
format: "npm run format",
start: "npm start",
version: "npm -v",
},
yarn: {
install: "yarn",
format: "yarn format",
start: "yarn start",
version: "yarn -v",
},
pnpm: {
install: "pnpm install",
format: "pnpm format",
start: "pnpm start",
version: "pnpm -v",
},
} as const

const installCmd = packageManagers[setup.packageManager].install

const formatCmd = packageManagers[setup.packageManager].format

const startCmd = packageManagers[setup.packageManager].start

const versionCmd = packageManagers[setup.packageManager].version

const dir = setup.name
const srcDir = path.join(dir, "src")
Expand All @@ -55,9 +63,15 @@ const init = async () => {

fs.mkdirSync(srcDir, { recursive: true })

const packageManagerVersion = execSync(versionCmd).toString().trim()

const config = runnerJSON(setup)

save(dir, "package.json", packageJSON(setup))
save(
dir,
"package.json",
packageJSON(Object.assign(setup, { packageManagerVersion })),
)
save(dir, ".prettierrc.json", prettierJSON(setup))
save(dir, ".gitignore", gitignoreTXT(setup))
save(dir, ".prettierignore", prettierignoreTXT(setup))
Expand Down
2 changes: 1 addition & 1 deletion src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ switch (String(command || "").toLowerCase()) {
}
case "update:readme": {
updateReadme()
break;
break
}
default: {
console.log("Command not supported")
Expand Down
13 changes: 12 additions & 1 deletion src/configs/packageJSON.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
import type { Setup } from "../types/common"
import version from "../version.js"

const packageJSON = ({ year, language, author }: Setup) => {
const packageJSON = ({
year,
language,
author,
packageManager,
packageManagerVersion,
}: Setup) => {
const build = language === "ts" ? { build: "aocrunner build" } : {}
const preferredPackageManager =
packageManager && Boolean(packageManagerVersion)
? { packageManager: `^${packageManager}@${packageManagerVersion}` }
: {}

return {
name: `aoc${year}`,
Expand All @@ -27,6 +37,7 @@ const packageJSON = ({ year, language, author }: Setup) => {
engines: {
node: ">=16.13.0",
},
...preferredPackageManager,
}
}

Expand Down
1 change: 1 addition & 0 deletions src/types/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export type Setup = {
author: string
semicolons: boolean
strict: boolean
packageManagerVersion?: string
}

type DayConfig = {
Expand Down