create-maa-project 1.2.0__tar.gz → 1.2.2__tar.gz

{create_maa_project-1.2.0 → create_maa_project-1.2.2}/.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: Release
 
 on:
   push:
@@ -153,6 +153,7 @@ jobs:
       - uses: softprops/action-gh-release@v3
         with:
           body_path: dist/release-notes/CHANGES.md
+          prerelease: ${{ contains(github.ref_name, '-') }}
           files: dist/release/*
 
   npm:

{create_maa_project-1.2.0 → create_maa_project-1.2.2}/.release/create-maa-project-manifest.json

@@ -1,68 +1,68 @@
 {
     "schemaVersion": 1,
     "name": "create-maa-project",
-    "version": "1.2.0",
-    "tag": "v1.2.0",
+    "version": "1.2.2",
+    "tag": "v1.2.2",
     "assets": [
         {
             "kind": "sea",
             "os": "linux",
             "arch": "aarch64",
-            "version": "1.2.0",
+            "version": "1.2.2",
             "name": "create-maa-project-linux-aarch64",
-            "url": "https://github.com/Windsland52/create-maa-project/releases/download/v1.2.0/create-maa-project-linux-aarch64",
-            "sha256": "8c23f9d9bc5f700b76b2460cf1957bda55ee54c216c0df082eede90a49dca659",
+            "url": "https://github.com/Windsland52/create-maa-project/releases/download/v1.2.2/create-maa-project-linux-aarch64",
+            "sha256": "302f1b94b68ead54ccfd7da68c5f0631fe2ea354469cc59da9238325cec6cc8f",
             "size": 123145344
         },
         {
             "kind": "sea",
             "os": "linux",
             "arch": "x86_64",
-            "version": "1.2.0",
+            "version": "1.2.2",
             "name": "create-maa-project-linux-x86_64",
-            "url": "https://github.com/Windsland52/create-maa-project/releases/download/v1.2.0/create-maa-project-linux-x86_64",
-            "sha256": "bef4d442be2049f223eb46cdb0292e52c1e8962bdac0ab38a7c16e90f7b386b6",
+            "url": "https://github.com/Windsland52/create-maa-project/releases/download/v1.2.2/create-maa-project-linux-x86_64",
+            "sha256": "8ee14bcb3fafea060891cf98b2a131381065c7053019ac4eb1d6dffc4fa36ff6",
             "size": 125045952
         },
         {
             "kind": "sea",
             "os": "macos",
             "arch": "aarch64",
-            "version": "1.2.0",
+            "version": "1.2.2",
             "name": "create-maa-project-macos-aarch64",
-            "url": "https://github.com/Windsland52/create-maa-project/releases/download/v1.2.0/create-maa-project-macos-aarch64",
-            "sha256": "0ac77bd2315d4ef794aa6fd608e9c39c0313571356e1a0cab6c50ad63b2e1d5a",
+            "url": "https://github.com/Windsland52/create-maa-project/releases/download/v1.2.2/create-maa-project-macos-aarch64",
+            "sha256": "b5cac2f528e7029224283dd7f623f85b6ab6199476ee6d29742d3323352119e4",
             "size": 121408240
         },
         {
             "kind": "sea",
             "os": "macos",
             "arch": "x86_64",
-            "version": "1.2.0",
+            "version": "1.2.2",
             "name": "create-maa-project-macos-x86_64",
-            "url": "https://github.com/Windsland52/create-maa-project/releases/download/v1.2.0/create-maa-project-macos-x86_64",
-            "sha256": "fd9e41740a326f54a2990f61f741ac2c0745c51eb76e8c850f4839185bc0cb29",
-            "size": 124476368
+            "url": "https://github.com/Windsland52/create-maa-project/releases/download/v1.2.2/create-maa-project-macos-x86_64",
+            "sha256": "05bb2f42843ce33bcb76e2dd701050ce224905bb08e5c620a4a6c62d7bb5da85",
+            "size": 124472240
         },
         {
             "kind": "sea",
             "os": "win",
             "arch": "aarch64",
-            "version": "1.2.0",
+            "version": "1.2.2",
             "name": "create-maa-project-win-aarch64.exe",
-            "url": "https://github.com/Windsland52/create-maa-project/releases/download/v1.2.0/create-maa-project-win-aarch64.exe",
-            "sha256": "fbbd714298b4d864818ebd0cf302d7e385fe9db4543485ee6a4d9f973bac4178",
-            "size": 82563584
+            "url": "https://github.com/Windsland52/create-maa-project/releases/download/v1.2.2/create-maa-project-win-aarch64.exe",
+            "sha256": "a554bdc37a181d7a407b1027effe5913a33833cea59c7707e1ec1fdd01df6342",
+            "size": 82560000
         },
         {
             "kind": "sea",
             "os": "win",
             "arch": "x86_64",
-            "version": "1.2.0",
+            "version": "1.2.2",
             "name": "create-maa-project-win-x86_64.exe",
-            "url": "https://github.com/Windsland52/create-maa-project/releases/download/v1.2.0/create-maa-project-win-x86_64.exe",
-            "sha256": "4063de4f3f16f6bee4a0c03f2f8a542115583fc2349ca06fdd56d232d45caab8",
-            "size": 94029824
+            "url": "https://github.com/Windsland52/create-maa-project/releases/download/v1.2.2/create-maa-project-win-x86_64.exe",
+            "sha256": "8a70811812de26fe0b9b51eb7908bd411351bfdbfe20da857bae82fb6d86db5c",
+            "size": 94026240
         }
     ]
 }

{create_maa_project-1.2.0 → create_maa_project-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: create-maa-project
-Version: 1.2.0
+Version: 1.2.2
 Summary: 用于创建和维护 MaaFW 应用项目的脚手架 CLI / Scaffold and maintenance CLI for MaaFW application projects
 Project-URL: Homepage, https://github.com/Windsland52/create-maa-project
 Project-URL: Source, https://github.com/Windsland52/create-maa-project

{create_maa_project-1.2.0 → create_maa_project-1.2.2}/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-maa-project",
-    "version": "1.2.0",
+    "version": "1.2.2",
     "description": "用于创建和维护 MaaFW 应用项目的脚手架 CLI / Scaffold and maintenance CLI for MaaFW application projects",
     "keywords": [
         "maafw",

create_maa_project-1.2.2/py-wrapper/create_maa_project/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.2.2"

create_maa_project-1.2.2/py-wrapper/create_maa_project/release_manifest.py

@@ -0,0 +1,2 @@
+# Filled by the release workflow when publishing the PyPI wrapper.
+RELEASE_MANIFEST_SHA256 = "5c42a0a01b4e2c34e18d8e8adba50bb541ecff5529a84d298b869e29e4864b41"

{create_maa_project-1.2.0 → create_maa_project-1.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "create-maa-project"
-version = "1.2.0"
+version = "1.2.2"
 description = "用于创建和维护 MaaFW 应用项目的脚手架 CLI / Scaffold and maintenance CLI for MaaFW application projects"
 keywords = ["maafw", "scaffold", "mcp"]
 readme = "README.md"

{create_maa_project-1.2.0 → create_maa_project-1.2.2}/src/doctor.ts

@@ -1,11 +1,9 @@
 import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { managedFileHash, readProjectConfig, readProjectLock } from './project.js'
-import { interfaceAgent, interfaceController, interfaceResourceItems } from './templates.js'
 import type { MaaProjectConfig, MaaProjectLock } from './types.js'
-import { projectControllerKinds } from './controllers.js'
 import { hasDevTools, hasGithubAutomation } from './features.js'
-import { addV, exists, readText } from './utils.js'
+import { exists, readText } from './utils.js'
 
 export type DoctorReport = {
   ok: boolean
@@ -21,13 +19,11 @@ export async function runDoctor(root: string): Promise<DoctorReport> {
   lines.push(`[OK] Project: ${config.project.displayName} (${config.project.slug})`)
   ok = (await checkInterfaceMetadata(root, config, lines)) && ok
   if (hasDevTools(config)) {
-    ok = (await checkPackageMetadata(root, config, lines)) && ok
     ok = (await checkNodeToolingFiles(root, config, lines)) && ok
     if (config.features.vscode.enabled) ok = (await checkVscodeSettings(root, lines)) && ok
     ok = (await checkNodeLockfile(root, lock, lines)) && ok
   }
-  ok = (await checkPyprojectMetadata(root, config, lines)) && ok
-  ok = (await checkResourceOrder(root, config, lines)) && ok
+  ok = (await checkResourcePaths(root, config, lines)) && ok
   ok = (await checkReferencedPaths(root, lines)) && ok
   ok = (await checkMaatoolsConfig(root, config, lines)) && ok
   ok = (await checkManagedFiles(root, lock, lines)) && ok
@@ -55,12 +51,7 @@ async function checkInterfaceMetadata(root: string, config: MaaProjectConfig, li
 
   const interfaceJson = JSON.parse(await readText(interfacePath)) as {
     name?: unknown
-    label?: unknown
-    version?: unknown
-    icon?: unknown
     github?: unknown
-    agent?: unknown
-    controller?: unknown
   }
   let ok = true
   const unmanaged = config.project.interfaceUnmanaged === true
@@ -75,49 +66,6 @@ async function checkInterfaceMetadata(root: string, config: MaaProjectConfig, li
       ok = false
     }
   }
-  if (interfaceJson.label !== config.project.displayName) {
-    if (unmanaged) {
-      lines.push(
-        '[INFO] interface.json label differs from maa-project.json project.displayName; interface.json is unmanaged so this is allowed.',
-      )
-    } else {
-      lines.push('[ERR] interface.json label differs from maa-project.json project.displayName.')
-      lines.push('      To fix: create-maa-project --sync metadata')
-      ok = false
-    }
-  }
-  if (interfaceJson.version !== addV(config.project.version)) {
-    if (unmanaged) {
-      lines.push(
-        '[INFO] interface.json version differs from maa-project.json project.version; interface.json is unmanaged so this is allowed.',
-      )
-    } else {
-      lines.push('[ERR] interface.json version differs from maa-project.json project.version.')
-      lines.push('      To fix: create-maa-project --sync metadata')
-      ok = false
-    }
-  }
-  if (interfaceJson.icon !== 'logo.ico') {
-    lines.push('[ERR] interface.json icon must be logo.ico.')
-    lines.push('      To fix: create-maa-project --sync metadata')
-    ok = false
-  }
-  if (interfaceJson.agent !== undefined && !Array.isArray(interfaceJson.agent)) {
-    lines.push('[ERR] interface.json agent must be an array.')
-    lines.push('      To fix: create-maa-project --sync metadata')
-    ok = false
-  }
-  if (JSON.stringify(interfaceJson.agent) !== JSON.stringify(expectedInterfaceAgent(config))) {
-    if (unmanaged) {
-      lines.push(
-        '[INFO] interface.json agent differs from maa-project.json python config; interface.json is unmanaged so this is allowed.',
-      )
-    } else {
-      lines.push('[ERR] interface.json agent differs from maa-project.json python config.')
-      lines.push('      To fix: create-maa-project --sync metadata')
-      ok = false
-    }
-  }
   if (interfaceJson.github !== config.project.github) {
     if (unmanaged) {
       lines.push(
@@ -129,113 +77,12 @@ async function checkInterfaceMetadata(root: string, config: MaaProjectConfig, li
       ok = false
     }
   }
-  if (
-    JSON.stringify(interfaceJson.controller ?? []) !==
-    JSON.stringify(interfaceController(projectControllerKinds(config)))
-  ) {
-    if (unmanaged) {
-      lines.push(
-        '[INFO] interface.json controller differs from maa-project.json controller.kinds; interface.json is unmanaged so this is allowed.',
-      )
-    } else {
-      lines.push('[ERR] interface.json controller differs from maa-project.json controller.kinds.')
-      lines.push('      To fix: create-maa-project --sync metadata')
-      ok = false
-    }
-  }
   if (ok) lines.push('[OK] Interface metadata matches project config.')
   return ok
 }
 
-function expectedInterfaceAgent(config: MaaProjectConfig): ReturnType<typeof interfaceAgent>[] | undefined {
-  return config.python
-    ? [
-        interfaceAgent(config.python.devCommand),
-      ]
-    : undefined
-}
-
-async function checkPackageMetadata(root: string, config: MaaProjectConfig, lines: string[]): Promise<boolean> {
-  const packagePath = join(root, 'package.json')
-  if (!(await exists(packagePath))) {
-    lines.push('[ERR] package.json is missing.')
-    lines.push('      To fix: restore it from backup or run create-maa-project --update template')
-    return false
-  }
-
-  const packageJson = JSON.parse(await readText(packagePath)) as {
-    name?: unknown
-    version?: unknown
-    license?: unknown
-    packageManager?: unknown
-    engines?: { node?: unknown }
-    devDependencies?: Record<string, unknown>
-    scripts?: Record<string, unknown>
-  }
-  const expectedLicense = config.license.spdx === 'None' ? 'UNLICENSED' : config.license.spdx
-  let ok = true
-  if (packageJson.name !== config.project.slug) {
-    lines.push('[ERR] package.json name differs from maa-project.json project.slug.')
-    lines.push('      To fix: create-maa-project --sync metadata')
-    ok = false
-  }
-  if (packageJson.version !== config.project.version) {
-    lines.push('[ERR] package.json version differs from maa-project.json project.version.')
-    lines.push('      To fix: create-maa-project --sync metadata')
-    ok = false
-  }
-  if (packageJson.license !== expectedLicense) {
-    lines.push('[ERR] package.json license differs from maa-project.json license.spdx.')
-    lines.push('      To fix: create-maa-project --sync metadata')
-    ok = false
-  }
-  if (packageJson.packageManager !== 'pnpm@11.5.1') {
-    lines.push('[ERR] package.json packageManager must be pnpm@11.5.1.')
-    lines.push('      To fix: create-maa-project --update template')
-    ok = false
-  }
-  if (packageJson.engines?.node !== '>=24') {
-    lines.push('[ERR] package.json engines.node must be >=24.')
-    lines.push('      To fix: create-maa-project --update template')
-    ok = false
-  }
-  for (const [
-    name,
-    version,
-  ] of Object.entries(expectedDevDependencies())) {
-    if (packageJson.devDependencies?.[name] !== version) {
-      const label = name === '@nekosu/maa-tools' ? '@nekosu/maa-tools' : `devDependencies.${name}`
-      lines.push(`[ERR] package.json ${label} must be pinned to ${version}.`)
-      lines.push('      To fix: create-maa-project --update template')
-      ok = false
-    }
-  }
-  for (const [
-    name,
-    command,
-  ] of Object.entries(expectedPackageScripts(config))) {
-    if (packageJson.scripts?.[name] !== command) {
-      const message =
-        name === 'check:maa'
-          ? 'package.json scripts.check:maa must use local pnpm exec maa-tools check.'
-          : `package.json scripts.${name} must be ${command}.`
-      lines.push(`[ERR] ${message}`)
-      lines.push('      To fix: create-maa-project --update template')
-      ok = false
-    }
-  }
-  if (ok) lines.push('[OK] Package metadata matches project config.')
-  return ok
-}
-
 async function checkNodeLockfile(root: string, lock: MaaProjectLock, lines: string[]): Promise<boolean> {
   if (lock.pending.some((item) => item.kind === 'node-deps')) return true
-  const packagePath = join(root, 'package.json')
-  if (!(await exists(packagePath))) return true
-  const packageJson = JSON.parse(await readText(packagePath)) as { packageManager?: unknown }
-  if (typeof packageJson.packageManager !== 'string' || !packageJson.packageManager.startsWith('pnpm@')) {
-    return true
-  }
   if (await exists(join(root, 'pnpm-lock.yaml'))) {
     lines.push('[OK] pnpm lockfile is present.')
     return true
@@ -331,41 +178,7 @@ async function checkVscodeSettings(root: string, lines: string[]): Promise<boole
   return ok
 }
 
-async function checkPyprojectMetadata(root: string, config: MaaProjectConfig, lines: string[]): Promise<boolean> {
-  if (!config.python) return true
-
-  const pyprojectPath = join(root, 'pyproject.toml')
-  if (!(await exists(pyprojectPath))) return true
-
-  const content = await readText(pyprojectPath)
-  const metadata = parseTomlProjectMetadata(content)
-  let ok = true
-  if (metadata.name !== config.project.slug) {
-    lines.push('[ERR] pyproject.toml project.name differs from maa-project.json project.slug.')
-    lines.push('      To fix: create-maa-project --sync metadata')
-    ok = false
-  }
-  if (metadata.version !== config.project.version) {
-    lines.push('[ERR] pyproject.toml project.version differs from maa-project.json project.version.')
-    lines.push('      To fix: create-maa-project --sync metadata')
-    ok = false
-  }
-  if (!tomlHasAgentWheelPackage(content)) {
-    lines.push('[ERR] pyproject.toml hatch wheel packages must include agent.')
-    lines.push('      To fix: create-maa-project --update template')
-    ok = false
-  }
-  if (ok) lines.push('[OK] Python project metadata matches project config.')
-  return ok
-}
-
-async function checkResourceOrder(root: string, config: MaaProjectConfig, lines: string[]): Promise<boolean> {
-  const first = config.resources[0]
-  if (!first || first.path !== 'resource/base') {
-    lines.push('[ERR] resource/base must be the first resource pack.')
-    lines.push('      To fix: edit maa-project.json resources order, then run create-maa-project --sync metadata')
-    return false
-  }
+async function checkResourcePaths(root: string, config: MaaProjectConfig, lines: string[]): Promise<boolean> {
   for (const pack of config.resources) {
     if (pack.path.includes('\\')) {
       lines.push(`[ERR] Resource pack path uses backslashes: ${pack.path}`)
@@ -378,18 +191,7 @@ async function checkResourceOrder(root: string, config: MaaProjectConfig, lines:
       return false
     }
   }
-  const interfacePath = join(root, 'interface.json')
-  if (await exists(interfacePath)) {
-    const interfaceJson = JSON.parse(await readText(interfacePath)) as { resource?: unknown }
-    const actual = Array.isArray(interfaceJson.resource) ? interfaceJson.resource : []
-    const expected = interfaceResourceItems(config.resources)
-    if (JSON.stringify(actual) !== JSON.stringify(expected)) {
-      lines.push('[ERR] interface.json resource order differs from maa-project.json resources.')
-      lines.push('      To fix: create-maa-project --sync metadata')
-      return false
-    }
-  }
-  lines.push('[OK] Resource packs are ordered and present.')
+  lines.push('[OK] Resource pack paths are present.')
   return true
 }
 
@@ -413,6 +215,12 @@ async function checkReferencedPaths(root: string, lines: string[]): Promise<bool
       ok = false
       continue
     }
+    if (!isProjectRelativePath(reference.path)) {
+      lines.push(`[ERR] interface.json ${reference.kind} path must stay within project root: ${reference.path}`)
+      lines.push('      To fix: use a project-relative path without .. segments')
+      ok = false
+      continue
+    }
     if (!(await exists(join(root, stripDotSlash(reference.path))))) {
       lines.push(`[ERR] interface.json ${reference.kind} path is missing: ${reference.path}`)
       lines.push('      To fix: restore the path or run create-maa-project --sync metadata')
@@ -502,6 +310,17 @@ function stripDotSlash(path: string): string {
   return path.startsWith('./') ? path.slice(2) : path
 }
 
+function isProjectRelativePath(path: string): boolean {
+  const stripped = stripDotSlash(path)
+  return (
+    stripped !== '' &&
+    stripped !== '.' &&
+    !stripped.startsWith('/') &&
+    !/^[A-Za-z]:/.test(stripped) &&
+    !stripped.split('/').includes('..')
+  )
+}
+
 function workflowPinsNode24(content: string): boolean {
   return /node-version:\s*['"]?24['"]?/.test(content)
 }
@@ -528,97 +347,3 @@ function hasJsoncFileAssociations(value: unknown): boolean {
 function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === 'object' && value !== null && !Array.isArray(value)
 }
-
-function expectedDevDependencies(): Record<string, string> {
-  return {
-    '@nekosu/maa-tools': '1.0.24',
-    '@nekosu/prettier-plugin-maafw-sort': '1.0.5',
-    ajv: '8.20.0',
-    'ajv-formats': '3.0.1',
-    'jsonc-parser': '3.3.1',
-    prettier: '3.8.4',
-    'prettier-plugin-multiline-arrays': '4.1.9',
-  }
-}
-
-function expectedPackageScripts(config: MaaProjectConfig): Record<string, string> {
-  const scripts: Record<string, string> = {
-    format: 'prettier --write .',
-    'format:check': 'prettier --check .',
-    lint: 'node tools/check-project.mjs',
-    'check:schema': 'node tools/validate-schema.mjs',
-    'check:maa': 'pnpm exec maa-tools check',
-    check: 'pnpm format:check && pnpm check:schema && pnpm check:maa && pnpm lint',
-  }
-  if (hasGithubAutomation(config)) {
-    scripts['release:dry-run'] = 'node tools/build-release.mjs --dry-run'
-    scripts['sync:runtime'] = 'node tools/sync-runtime.mjs'
-  }
-  if (config.addons.schemaSync) {
-    scripts['sync:schema'] = 'node tools/sync-schema.mjs'
-  }
-  if (config.addons.optimizeImages) {
-    scripts['optimize:images'] = 'node tools/optimize-images.mjs'
-  }
-  if (config.python) {
-    scripts['format:py'] = 'uv run --frozen ruff format .'
-    scripts['lint:py'] = 'uv run --frozen ruff check .'
-    scripts['typecheck:py'] = 'uv run --frozen pyright'
-    scripts['check:py'] = 'pnpm lint:py && pnpm typecheck:py'
-  }
-  return scripts
-}
-
-function parseTomlProjectMetadata(content: string): {
-  name: string | undefined
-  version: string | undefined
-} {
-  const section = tomlProjectSection(content)
-  return {
-    name: parseTomlStringField(section, 'name'),
-    version: parseTomlStringField(section, 'version'),
-  }
-}
-
-function tomlProjectSection(content: string): string {
-  const section: string[] = []
-  let inside = false
-  for (const line of content.split(/\r?\n/)) {
-    if (/^\s*\[project\]\s*$/.test(line)) {
-      inside = true
-      continue
-    }
-    if (inside && /^\s*\[[^\]]+\]\s*$/.test(line)) break
-    if (inside) section.push(line)
-  }
-  return section.join('\n')
-}
-
-function tomlHasAgentWheelPackage(content: string): boolean {
-  const section = tomlSection(content, 'tool.hatch.build.targets.wheel')
-  return /^\s*packages\s*=\s*\[\s*"agent"\s*\]\s*$/m.test(section)
-}
-
-function tomlSection(content: string, name: string): string {
-  const section: string[] = []
-  let inside = false
-  const pattern = new RegExp(`^\\s*\\[${escapeRegExp(name)}\\]\\s*$`)
-  for (const line of content.split(/\r?\n/)) {
-    if (pattern.test(line)) {
-      inside = true
-      continue
-    }
-    if (inside && /^\s*\[[^\]]+\]\s*$/.test(line)) break
-    if (inside) section.push(line)
-  }
-  return section.join('\n')
-}
-
-function escapeRegExp(value: string): string {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-}
-
-function parseTomlStringField(section: string, key: 'name' | 'version'): string | undefined {
-  const match = section.match(new RegExp(`^\\s*${key}\\s*=\\s*"([^"]*)"\\s*$`, 'm'))
-  return match?.[1]
-}