@kubohiroya/sb3-toolchain 0.24.0 → 0.25.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { assert } from "./assert.js";
2
2
  import { compareDirectories, inspectGitOutputState, validateOutputDirectoryPath } from "./output-safety.js";
3
+ import { blockPaletteCommentMarker, blockPaletteCommentMaxLength, blockPaletteCommentReference, blockPaletteFile, blockPaletteFormatVersion, blockPaletteSpriteCommentHeader, blockPaletteStageCommentHeader, formatBlockPaletteComment, serializeBlockPaletteDocument, validateBlockPaletteDocument } from "./block-palette.js";
3
4
  import { validateArchiveEntryName } from "./archive.js";
4
5
  import { compareExtensionApiManifests, defaultExtensionApiManifestSizeLimit, extensionApiManifestEffects, extensionApiManifestFormatVersion, extensionApiManifestFormatVersions, extensionApiManifestIntegrity, extensionApiManifestLocalPath, extensionApiManifestResultTypes, formatExtensionApiCompatibilityChanges, parseExtensionApiManifest, tryParseExtensionApiManifest, validateExtensionApiManifestSourceMetadata, validateManagedExtensionApiManifest } from "./extension-api-manifest.js";
5
6
  import { extensionHeaderId, extensionHeaderMetadata, extensionIntegrity, unsandboxedRequirement, unsandboxedRequirements, validateExtensionSourceMetadata, validateManagedExtensionContents } from "./extension-dependencies.js";
@@ -7,7 +8,7 @@ import { buildExtensionBundles, bundleUnsandboxedRequirement, createStaticExtens
7
8
  import { buildExtensionBundlesWithModules } from "./extension-module-bundle.js";
8
9
  import { applyProjectAssetAdditions, projectAssetAdditionsFormatVersion } from "./project-asset-additions.js";
9
10
  import { cleanUpTurboWarpBlocks, turboWarpCleanUpLayout } from "./turbowarp-clean-up.js";
10
- import { sourceFormatVersion } from "./source-format.js";
11
+ import { blockPaletteSourceFormatVersion, sourceFormatVersion, supportedSourceFormatVersions } from "./source-format.js";
11
12
  import { createDeterministicSb3, fixedZipTimestamp, validateSb3Source } from "./source.js";
12
13
  import { buildSb3 } from "./build.js";
13
14
  import { cleanUpSb3, cleanUpSb3Archive } from "./clean-up-sb3.js";
@@ -20,4 +21,4 @@ import { migrateExtensionId, planExtensionIdMigration, validateNewExtensionId }
20
21
  import { defaultKamishibaiManifestUrl, kamishibaiReplacementIds, replaceSb3Extensions } from "./extension-sb3-replacement.js";
21
22
  import { defaultExtensionArtifactSizeLimit, extensionStatus, syncExtensions, updateExtensions } from "./extension-sync.js";
22
23
  import { assertSb3ReleaseSnapshotMetadata, computeReleaseSourceIdentity, createSb3ReleaseSnapshot, createSb3ReleaseSnapshotMetadata, freezeSb3ReleaseSnapshot, readSb3ReleaseSnapshotMetadata, recordPublishedSb3ReleaseSnapshot, verifySb3ReleaseSnapshot, writeSb3ReleaseCandidate } from "./release-snapshot.js";
23
- export { applyProjectAssetAdditions, assert, assertSb3ReleaseSnapshotMetadata, buildExtensionBundles, buildExtensionBundlesWithModules, buildSb3, bundleExtensions, bundleUnsandboxedRequirement, cleanUpSb3, cleanUpSb3Archive, cleanUpTurboWarpBlocks, compareDirectories, compareExtensionApiManifests, computeReleaseSourceIdentity, createDeterministicSb3, createSb3ReleaseSnapshot, createSb3ReleaseSnapshotMetadata, createStaticExtensionBundle, decodeExtensionDataUrl, defaultExtensionApiManifestSizeLimit, defaultExtensionArtifactSizeLimit, defaultKamishibaiManifestUrl, defaultSandboxedNotices, extensionApiManifestEffects, extensionApiManifestFormatVersion, extensionApiManifestFormatVersions, extensionApiManifestIntegrity, extensionApiManifestLocalPath, extensionApiManifestResultTypes, extensionBundleRecoveryMarker, extensionHeaderId, extensionHeaderMetadata, extensionIntegrity, extensionSourceTypes, extensionStatus, fixedZipTimestamp, formatExtensionApiCompatibilityChanges, formatExtensionDigestInventory, freezeSb3ReleaseSnapshot, importSb3, inspectGitOutputState, inspectSb3ExtensionDigests, inventoryExtensionDigests, kamishibaiReplacementIds, migrateExtensionId, packageName, packageVersion, parseExtensionApiManifest, planBundledSb3Unbundle, planExtensionBundle, planExtensionIdMigration, planExtensionUnbundle, projectAssetAdditionsFormatVersion, projectManifestKey, readProjectManifest, readSb3ReleaseSnapshotMetadata, recordPublishedSb3ReleaseSnapshot, replaceSb3Extensions, sourceFormatVersion, syncExtensions, tryParseExtensionApiManifest, turboWarpCleanUpLayout, unbundleExtensions, unbundleSb3, unsandboxedRequirement, unsandboxedRequirements, updateExtensions, validateArchiveEntryName, validateExtensionApiManifestSourceMetadata, validateExtensionBundleConfigurations, validateExtensionSourceMetadata, validateManagedExtensionApiManifest, validateManagedExtensionContents, validateNewExtensionId, validateOutputDirectoryPath, validateSb3Source, verifySb3ReleaseSnapshot, writeSb3ReleaseCandidate };
24
+ export { applyProjectAssetAdditions, assert, assertSb3ReleaseSnapshotMetadata, blockPaletteCommentMarker, blockPaletteCommentMaxLength, blockPaletteCommentReference, blockPaletteFile, blockPaletteFormatVersion, blockPaletteSourceFormatVersion, blockPaletteSpriteCommentHeader, blockPaletteStageCommentHeader, buildExtensionBundles, buildExtensionBundlesWithModules, buildSb3, bundleExtensions, bundleUnsandboxedRequirement, cleanUpSb3, cleanUpSb3Archive, cleanUpTurboWarpBlocks, compareDirectories, compareExtensionApiManifests, computeReleaseSourceIdentity, createDeterministicSb3, createSb3ReleaseSnapshot, createSb3ReleaseSnapshotMetadata, createStaticExtensionBundle, decodeExtensionDataUrl, defaultExtensionApiManifestSizeLimit, defaultExtensionArtifactSizeLimit, defaultKamishibaiManifestUrl, defaultSandboxedNotices, extensionApiManifestEffects, extensionApiManifestFormatVersion, extensionApiManifestFormatVersions, extensionApiManifestIntegrity, extensionApiManifestLocalPath, extensionApiManifestResultTypes, extensionBundleRecoveryMarker, extensionHeaderId, extensionHeaderMetadata, extensionIntegrity, extensionSourceTypes, extensionStatus, fixedZipTimestamp, formatBlockPaletteComment, formatExtensionApiCompatibilityChanges, formatExtensionDigestInventory, freezeSb3ReleaseSnapshot, importSb3, inspectGitOutputState, inspectSb3ExtensionDigests, inventoryExtensionDigests, kamishibaiReplacementIds, migrateExtensionId, packageName, packageVersion, parseExtensionApiManifest, planBundledSb3Unbundle, planExtensionBundle, planExtensionIdMigration, planExtensionUnbundle, projectAssetAdditionsFormatVersion, projectManifestKey, readProjectManifest, readSb3ReleaseSnapshotMetadata, recordPublishedSb3ReleaseSnapshot, replaceSb3Extensions, serializeBlockPaletteDocument, sourceFormatVersion, supportedSourceFormatVersions, syncExtensions, tryParseExtensionApiManifest, turboWarpCleanUpLayout, unbundleExtensions, unbundleSb3, unsandboxedRequirement, unsandboxedRequirements, updateExtensions, validateArchiveEntryName, validateBlockPaletteDocument, validateExtensionApiManifestSourceMetadata, validateExtensionBundleConfigurations, validateExtensionSourceMetadata, validateManagedExtensionApiManifest, validateManagedExtensionContents, validateNewExtensionId, validateOutputDirectoryPath, validateSb3Source, verifySb3ReleaseSnapshot, writeSb3ReleaseCandidate };
@@ -20,7 +20,7 @@ export interface GitOutputState {
20
20
  }
21
21
  export declare function pathExists(targetPath: string): Promise<boolean>;
22
22
  export declare function validateOutputDirectoryPath(outputDirectory: string, protectedRoot: string): string;
23
- export declare function assertRecognizedOutputDirectory(outputDirectory: string, sourceFormatVersion: number): Promise<void>;
23
+ export declare function assertRecognizedOutputDirectory(outputDirectory: string, sourceFormatVersions: readonly number[]): Promise<void>;
24
24
  export declare function compareDirectories(existingDirectory: string, candidateDirectory: string): Promise<DirectoryComparison>;
25
25
  export declare function inspectGitOutputState(outputDirectory: string, existingFilePaths: string[]): Promise<GitOutputState>;
26
26
  export declare function assertNoInterruptedRollback(outputDirectory: string): Promise<void>;
@@ -28,7 +28,7 @@ function validateOutputDirectoryPath(outputDirectory, protectedRoot) {
28
28
  assert(!resolvedOutputDirectory.split(path.sep).includes(".git"), "Refusing to write imported SB3 sources into a .git directory.");
29
29
  return resolvedOutputDirectory;
30
30
  }
31
- async function assertRecognizedOutputDirectory(outputDirectory, sourceFormatVersion) {
31
+ async function assertRecognizedOutputDirectory(outputDirectory, sourceFormatVersions) {
32
32
  const stats = await lstat(outputDirectory);
33
33
  assert(stats.isDirectory() && !stats.isSymbolicLink(), `Refusing to replace a non-directory or symbolic link: ${outputDirectory}`);
34
34
  let manifest;
@@ -38,7 +38,7 @@ async function assertRecognizedOutputDirectory(outputDirectory, sourceFormatVers
38
38
  if (errorCode(error) !== "ENOENT" && !(error instanceof SyntaxError)) throw error;
39
39
  throw new Error(`Refusing to replace an unrecognized directory without a valid sb3-source.json: ${outputDirectory}`, { cause: error });
40
40
  }
41
- assert(manifest?.formatVersion === sourceFormatVersion && manifest.project === "project.source.json" && manifest.embeddedExtensions === "embedded-extensions.json" && manifest.assetsDirectory === "assets" && Array.isArray(manifest.archiveEntries), `Refusing to replace an unrecognized directory without a valid sb3-source.json: ${outputDirectory}`);
41
+ assert(manifest !== null && sourceFormatVersions.includes(manifest.formatVersion) && manifest.project === "project.source.json" && manifest.embeddedExtensions === "embedded-extensions.json" && manifest.assetsDirectory === "assets" && Array.isArray(manifest.archiveEntries), `Refusing to replace an unrecognized directory without a valid sb3-source.json: ${outputDirectory}`);
42
42
  }
43
43
  function digest(value) {
44
44
  return createHash("sha256").update(value).digest("hex");
@@ -1 +1 @@
1
- {"version":3,"file":"output-safety.js","names":[],"sources":["../src/output-safety.ts"],"sourcesContent":["// SPDX-License-Identifier: MPL-2.0\n\nimport {execFile} from 'node:child_process';\nimport {createHash, randomUUID} from 'node:crypto';\nimport {access, lstat, realpath, readdir, readFile, readlink, rename, rm} from 'node:fs/promises';\nimport path from 'node:path';\n\nimport {assert, errorMessage} from './assert';\n\ntype SnapshotEntry =\n | {type: 'directory'}\n | {type: 'file'; size: number; digest: string}\n | {type: 'symbolic-link'; target: string}\n | {type: 'other'};\n\nexport interface DirectoryDifferences {\n added: string[];\n modified: string[];\n removed: string[];\n}\n\nexport interface DirectoryComparison {\n candidateFingerprint: string;\n differences: DirectoryDifferences;\n existingFilePaths: string[];\n existingFingerprint: string;\n identical: boolean;\n}\n\nexport interface GitOutputState {\n clean: boolean;\n fingerprint: string;\n managed: boolean;\n repositoryRoot: string | null;\n statusEntries: string[];\n untrackedContent: string[];\n}\n\nfunction errorCode(error: unknown): string | number | undefined {\n return (error as NodeJS.ErrnoException | null)?.code;\n}\n\nexport async function pathExists(targetPath: string): Promise<boolean> {\n try {\n await access(targetPath);\n return true;\n } catch (error) {\n if (errorCode(error) === 'ENOENT') {\n return false;\n }\n throw error;\n }\n}\n\nfunction isSamePathOrAncestor(candidatePath: string, targetPath: string): boolean {\n const relativePath = path.relative(candidatePath, targetPath);\n return (\n relativePath === '' ||\n (relativePath !== '..' &&\n !relativePath.startsWith(`..${path.sep}`) &&\n !path.isAbsolute(relativePath))\n );\n}\n\nexport function validateOutputDirectoryPath(\n outputDirectory: string,\n protectedRoot: string,\n): string {\n const resolvedOutputDirectory = path.resolve(outputDirectory);\n const resolvedProtectedRoot = path.resolve(protectedRoot);\n assert(\n resolvedOutputDirectory !== path.parse(resolvedOutputDirectory).root,\n 'Refusing to replace a filesystem root with imported SB3 sources.',\n );\n assert(\n !isSamePathOrAncestor(resolvedOutputDirectory, resolvedProtectedRoot),\n 'Refusing to replace the repository root or one of its ancestors.',\n );\n assert(\n !resolvedOutputDirectory.split(path.sep).includes('.git'),\n 'Refusing to write imported SB3 sources into a .git directory.',\n );\n return resolvedOutputDirectory;\n}\n\nexport async function assertRecognizedOutputDirectory(\n outputDirectory: string,\n sourceFormatVersion: number,\n): Promise<void> {\n const stats = await lstat(outputDirectory);\n assert(\n stats.isDirectory() && !stats.isSymbolicLink(),\n `Refusing to replace a non-directory or symbolic link: ${outputDirectory}`,\n );\n\n let manifest: Record<string, unknown> | null;\n try {\n manifest = JSON.parse(await readFile(path.join(outputDirectory, 'sb3-source.json'), 'utf8'));\n } catch (error) {\n if (errorCode(error) !== 'ENOENT' && !(error instanceof SyntaxError)) {\n throw error;\n }\n throw new Error(\n `Refusing to replace an unrecognized directory without a valid sb3-source.json: ${outputDirectory}`,\n {cause: error},\n );\n }\n\n assert(\n manifest?.formatVersion === sourceFormatVersion &&\n manifest.project === 'project.source.json' &&\n manifest.embeddedExtensions === 'embedded-extensions.json' &&\n manifest.assetsDirectory === 'assets' &&\n Array.isArray(manifest.archiveEntries),\n `Refusing to replace an unrecognized directory without a valid sb3-source.json: ${outputDirectory}`,\n );\n}\n\nfunction digest(value: Uint8Array | string): string {\n return createHash('sha256').update(value).digest('hex');\n}\n\nasync function snapshotDirectory(rootDirectory: string): Promise<Map<string, SnapshotEntry>> {\n const snapshot = new Map<string, SnapshotEntry>();\n\n async function visit(directory: string, relativeDirectory: string): Promise<void> {\n const entries = await readdir(directory, {withFileTypes: true});\n entries.sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));\n\n for (const entry of entries) {\n const relativePath = relativeDirectory\n ? path.posix.join(relativeDirectory, entry.name)\n : entry.name;\n const absolutePath = path.join(directory, entry.name);\n if (entry.isDirectory()) {\n snapshot.set(relativePath, {type: 'directory'});\n await visit(absolutePath, relativePath);\n } else if (entry.isFile()) {\n const contents = await readFile(absolutePath);\n snapshot.set(relativePath, {\n type: 'file',\n size: contents.length,\n digest: digest(contents),\n });\n } else if (entry.isSymbolicLink()) {\n snapshot.set(relativePath, {\n type: 'symbolic-link',\n target: await readlink(absolutePath),\n });\n } else {\n snapshot.set(relativePath, {type: 'other'});\n }\n }\n }\n\n await visit(rootDirectory, '');\n return snapshot;\n}\n\nfunction snapshotFingerprint(snapshot: Map<string, SnapshotEntry>): string {\n return digest(JSON.stringify([...snapshot.entries()]));\n}\n\nfunction entriesMatch(left: SnapshotEntry, right: SnapshotEntry): boolean {\n return JSON.stringify(left) === JSON.stringify(right);\n}\n\nexport async function compareDirectories(\n existingDirectory: string,\n candidateDirectory: string,\n): Promise<DirectoryComparison> {\n const [existingSnapshot, candidateSnapshot] = await Promise.all([\n snapshotDirectory(existingDirectory),\n snapshotDirectory(candidateDirectory),\n ]);\n const paths = [...new Set([...existingSnapshot.keys(), ...candidateSnapshot.keys()])].sort();\n const differences: DirectoryDifferences = {added: [], modified: [], removed: []};\n\n for (const relativePath of paths) {\n const existingEntry = existingSnapshot.get(relativePath);\n const candidateEntry = candidateSnapshot.get(relativePath);\n if (!existingEntry) {\n differences.added.push(relativePath);\n } else if (!candidateEntry) {\n differences.removed.push(relativePath);\n } else if (!entriesMatch(existingEntry, candidateEntry)) {\n differences.modified.push(relativePath);\n }\n }\n\n return {\n candidateFingerprint: snapshotFingerprint(candidateSnapshot),\n differences,\n existingFilePaths: [...existingSnapshot.entries()]\n .filter(([, entry]) => entry.type !== 'directory')\n .map(([relativePath]) => relativePath),\n existingFingerprint: snapshotFingerprint(existingSnapshot),\n identical: Object.values(differences).every((entries) => entries.length === 0),\n };\n}\n\nfunction executeGit(arguments_: string[], cwd: string): Promise<string> {\n return new Promise<string>((resolve, reject) => {\n execFile(\n 'git',\n arguments_,\n {cwd, encoding: 'utf8', maxBuffer: 10 * 1024 * 1024},\n (error, stdout, stderr) => {\n if (error) {\n Object.assign(error, {stdout, stderr});\n reject(error);\n return;\n }\n resolve(stdout);\n },\n );\n });\n}\n\nfunction toPosixPath(value: string): string {\n return value.split(path.sep).join('/');\n}\n\nexport async function inspectGitOutputState(\n outputDirectory: string,\n existingFilePaths: string[],\n): Promise<GitOutputState> {\n let repositoryRoot: string;\n try {\n repositoryRoot = (await executeGit(['rev-parse', '--show-toplevel'], outputDirectory)).trim();\n } catch (error) {\n if (errorCode(error) === 128) {\n return {\n clean: false,\n fingerprint: 'not-git-managed',\n managed: false,\n repositoryRoot: null,\n statusEntries: [],\n untrackedContent: [...existingFilePaths],\n };\n }\n throw error;\n }\n\n const [canonicalOutputDirectory, canonicalRepositoryRoot] = await Promise.all([\n realpath(outputDirectory),\n realpath(repositoryRoot),\n ]);\n repositoryRoot = canonicalRepositoryRoot;\n const relativeOutputDirectory = path.relative(repositoryRoot, canonicalOutputDirectory);\n assert(\n relativeOutputDirectory !== '..' &&\n !relativeOutputDirectory.startsWith(`..${path.sep}`) &&\n !path.isAbsolute(relativeOutputDirectory),\n `Output directory is outside its detected Git worktree: ${outputDirectory}`,\n );\n const pathspec = relativeOutputDirectory || '.';\n const [statusOutput, trackedOutput] = await Promise.all([\n executeGit(\n ['status', '--porcelain=v1', '--untracked-files=all', '--', pathspec],\n repositoryRoot,\n ),\n executeGit(['ls-files', '-z', '--', pathspec], repositoryRoot),\n ]);\n const statusEntries = statusOutput.split('\\n').filter(Boolean);\n const trackedPaths = new Set(\n trackedOutput\n .split('\\0')\n .filter(Boolean)\n .map((trackedPath) =>\n toPosixPath(\n path.relative(canonicalOutputDirectory, path.join(repositoryRoot, trackedPath)),\n ),\n ),\n );\n const untrackedContent = existingFilePaths.filter((filePath) => !trackedPaths.has(filePath));\n const managed = trackedPaths.size > 0;\n const clean = managed && statusEntries.length === 0 && untrackedContent.length === 0;\n const fingerprint = digest(\n JSON.stringify({\n clean,\n managed,\n repositoryRoot,\n statusEntries,\n trackedPaths: [...trackedPaths].sort(),\n untrackedContent: [...untrackedContent].sort(),\n }),\n );\n\n return {\n clean,\n fingerprint,\n managed,\n repositoryRoot,\n statusEntries,\n untrackedContent,\n };\n}\n\nexport async function assertNoInterruptedRollback(outputDirectory: string): Promise<void> {\n const parentDirectory = path.dirname(outputDirectory);\n const outputName = path.basename(outputDirectory);\n const rollbackPrefixes = [`.${outputName}.rollback-`, `.${outputName}.backup-`];\n const leftovers = (await readdir(parentDirectory))\n .filter((entryName) => rollbackPrefixes.some((prefix) => entryName.startsWith(prefix)))\n .map((entryName) => path.join(parentDirectory, entryName));\n assert(\n leftovers.length === 0,\n `Found an interrupted SB3 import rollback directory. ` +\n `Inspect or restore it before retrying: ${leftovers.join(', ')}`,\n );\n}\n\nexport async function replaceDirectoryTransactionally(\n temporaryDirectory: string,\n outputDirectory: string,\n): Promise<{rollbackCleanupWarning: string | null}> {\n const parentDirectory = path.dirname(outputDirectory);\n await assertNoInterruptedRollback(outputDirectory);\n const rollbackDirectory = path.join(\n parentDirectory,\n `.${path.basename(outputDirectory)}.rollback-${randomUUID()}`,\n );\n assert(\n !(await pathExists(rollbackDirectory)),\n `Refusing to overwrite an existing rollback directory: ${rollbackDirectory}`,\n );\n const outputExists = await pathExists(outputDirectory);\n\n if (outputExists) {\n await rename(outputDirectory, rollbackDirectory);\n }\n\n try {\n await rename(temporaryDirectory, outputDirectory);\n } catch (installError) {\n if (outputExists) {\n try {\n await rename(rollbackDirectory, outputDirectory);\n } catch (restoreError) {\n throw new AggregateError(\n [installError, restoreError],\n `SB3 import failed and automatic restoration also failed. ` +\n `Original output remains at: ${rollbackDirectory}`,\n );\n }\n }\n throw installError;\n }\n\n if (!outputExists) {\n return {rollbackCleanupWarning: null};\n }\n\n try {\n await rm(rollbackDirectory, {recursive: true});\n return {rollbackCleanupWarning: null};\n } catch (error) {\n return {\n rollbackCleanupWarning:\n `Imported output was installed, but its temporary rollback ` +\n `directory could not be removed: ${rollbackDirectory} (${errorMessage(error)})`,\n };\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"output-safety.js","names":[],"sources":["../src/output-safety.ts"],"sourcesContent":["// SPDX-License-Identifier: MPL-2.0\n\nimport {execFile} from 'node:child_process';\nimport {createHash, randomUUID} from 'node:crypto';\nimport {access, lstat, realpath, readdir, readFile, readlink, rename, rm} from 'node:fs/promises';\nimport path from 'node:path';\n\nimport {assert, errorMessage} from './assert';\n\ntype SnapshotEntry =\n | {type: 'directory'}\n | {type: 'file'; size: number; digest: string}\n | {type: 'symbolic-link'; target: string}\n | {type: 'other'};\n\nexport interface DirectoryDifferences {\n added: string[];\n modified: string[];\n removed: string[];\n}\n\nexport interface DirectoryComparison {\n candidateFingerprint: string;\n differences: DirectoryDifferences;\n existingFilePaths: string[];\n existingFingerprint: string;\n identical: boolean;\n}\n\nexport interface GitOutputState {\n clean: boolean;\n fingerprint: string;\n managed: boolean;\n repositoryRoot: string | null;\n statusEntries: string[];\n untrackedContent: string[];\n}\n\nfunction errorCode(error: unknown): string | number | undefined {\n return (error as NodeJS.ErrnoException | null)?.code;\n}\n\nexport async function pathExists(targetPath: string): Promise<boolean> {\n try {\n await access(targetPath);\n return true;\n } catch (error) {\n if (errorCode(error) === 'ENOENT') {\n return false;\n }\n throw error;\n }\n}\n\nfunction isSamePathOrAncestor(candidatePath: string, targetPath: string): boolean {\n const relativePath = path.relative(candidatePath, targetPath);\n return (\n relativePath === '' ||\n (relativePath !== '..' &&\n !relativePath.startsWith(`..${path.sep}`) &&\n !path.isAbsolute(relativePath))\n );\n}\n\nexport function validateOutputDirectoryPath(\n outputDirectory: string,\n protectedRoot: string,\n): string {\n const resolvedOutputDirectory = path.resolve(outputDirectory);\n const resolvedProtectedRoot = path.resolve(protectedRoot);\n assert(\n resolvedOutputDirectory !== path.parse(resolvedOutputDirectory).root,\n 'Refusing to replace a filesystem root with imported SB3 sources.',\n );\n assert(\n !isSamePathOrAncestor(resolvedOutputDirectory, resolvedProtectedRoot),\n 'Refusing to replace the repository root or one of its ancestors.',\n );\n assert(\n !resolvedOutputDirectory.split(path.sep).includes('.git'),\n 'Refusing to write imported SB3 sources into a .git directory.',\n );\n return resolvedOutputDirectory;\n}\n\nexport async function assertRecognizedOutputDirectory(\n outputDirectory: string,\n sourceFormatVersions: readonly number[],\n): Promise<void> {\n const stats = await lstat(outputDirectory);\n assert(\n stats.isDirectory() && !stats.isSymbolicLink(),\n `Refusing to replace a non-directory or symbolic link: ${outputDirectory}`,\n );\n\n let manifest: Record<string, unknown> | null;\n try {\n manifest = JSON.parse(await readFile(path.join(outputDirectory, 'sb3-source.json'), 'utf8'));\n } catch (error) {\n if (errorCode(error) !== 'ENOENT' && !(error instanceof SyntaxError)) {\n throw error;\n }\n throw new Error(\n `Refusing to replace an unrecognized directory without a valid sb3-source.json: ${outputDirectory}`,\n {cause: error},\n );\n }\n\n assert(\n manifest !== null &&\n sourceFormatVersions.includes(manifest.formatVersion as number) &&\n manifest.project === 'project.source.json' &&\n manifest.embeddedExtensions === 'embedded-extensions.json' &&\n manifest.assetsDirectory === 'assets' &&\n Array.isArray(manifest.archiveEntries),\n `Refusing to replace an unrecognized directory without a valid sb3-source.json: ${outputDirectory}`,\n );\n}\n\nfunction digest(value: Uint8Array | string): string {\n return createHash('sha256').update(value).digest('hex');\n}\n\nasync function snapshotDirectory(rootDirectory: string): Promise<Map<string, SnapshotEntry>> {\n const snapshot = new Map<string, SnapshotEntry>();\n\n async function visit(directory: string, relativeDirectory: string): Promise<void> {\n const entries = await readdir(directory, {withFileTypes: true});\n entries.sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));\n\n for (const entry of entries) {\n const relativePath = relativeDirectory\n ? path.posix.join(relativeDirectory, entry.name)\n : entry.name;\n const absolutePath = path.join(directory, entry.name);\n if (entry.isDirectory()) {\n snapshot.set(relativePath, {type: 'directory'});\n await visit(absolutePath, relativePath);\n } else if (entry.isFile()) {\n const contents = await readFile(absolutePath);\n snapshot.set(relativePath, {\n type: 'file',\n size: contents.length,\n digest: digest(contents),\n });\n } else if (entry.isSymbolicLink()) {\n snapshot.set(relativePath, {\n type: 'symbolic-link',\n target: await readlink(absolutePath),\n });\n } else {\n snapshot.set(relativePath, {type: 'other'});\n }\n }\n }\n\n await visit(rootDirectory, '');\n return snapshot;\n}\n\nfunction snapshotFingerprint(snapshot: Map<string, SnapshotEntry>): string {\n return digest(JSON.stringify([...snapshot.entries()]));\n}\n\nfunction entriesMatch(left: SnapshotEntry, right: SnapshotEntry): boolean {\n return JSON.stringify(left) === JSON.stringify(right);\n}\n\nexport async function compareDirectories(\n existingDirectory: string,\n candidateDirectory: string,\n): Promise<DirectoryComparison> {\n const [existingSnapshot, candidateSnapshot] = await Promise.all([\n snapshotDirectory(existingDirectory),\n snapshotDirectory(candidateDirectory),\n ]);\n const paths = [...new Set([...existingSnapshot.keys(), ...candidateSnapshot.keys()])].sort();\n const differences: DirectoryDifferences = {added: [], modified: [], removed: []};\n\n for (const relativePath of paths) {\n const existingEntry = existingSnapshot.get(relativePath);\n const candidateEntry = candidateSnapshot.get(relativePath);\n if (!existingEntry) {\n differences.added.push(relativePath);\n } else if (!candidateEntry) {\n differences.removed.push(relativePath);\n } else if (!entriesMatch(existingEntry, candidateEntry)) {\n differences.modified.push(relativePath);\n }\n }\n\n return {\n candidateFingerprint: snapshotFingerprint(candidateSnapshot),\n differences,\n existingFilePaths: [...existingSnapshot.entries()]\n .filter(([, entry]) => entry.type !== 'directory')\n .map(([relativePath]) => relativePath),\n existingFingerprint: snapshotFingerprint(existingSnapshot),\n identical: Object.values(differences).every((entries) => entries.length === 0),\n };\n}\n\nfunction executeGit(arguments_: string[], cwd: string): Promise<string> {\n return new Promise<string>((resolve, reject) => {\n execFile(\n 'git',\n arguments_,\n {cwd, encoding: 'utf8', maxBuffer: 10 * 1024 * 1024},\n (error, stdout, stderr) => {\n if (error) {\n Object.assign(error, {stdout, stderr});\n reject(error);\n return;\n }\n resolve(stdout);\n },\n );\n });\n}\n\nfunction toPosixPath(value: string): string {\n return value.split(path.sep).join('/');\n}\n\nexport async function inspectGitOutputState(\n outputDirectory: string,\n existingFilePaths: string[],\n): Promise<GitOutputState> {\n let repositoryRoot: string;\n try {\n repositoryRoot = (await executeGit(['rev-parse', '--show-toplevel'], outputDirectory)).trim();\n } catch (error) {\n if (errorCode(error) === 128) {\n return {\n clean: false,\n fingerprint: 'not-git-managed',\n managed: false,\n repositoryRoot: null,\n statusEntries: [],\n untrackedContent: [...existingFilePaths],\n };\n }\n throw error;\n }\n\n const [canonicalOutputDirectory, canonicalRepositoryRoot] = await Promise.all([\n realpath(outputDirectory),\n realpath(repositoryRoot),\n ]);\n repositoryRoot = canonicalRepositoryRoot;\n const relativeOutputDirectory = path.relative(repositoryRoot, canonicalOutputDirectory);\n assert(\n relativeOutputDirectory !== '..' &&\n !relativeOutputDirectory.startsWith(`..${path.sep}`) &&\n !path.isAbsolute(relativeOutputDirectory),\n `Output directory is outside its detected Git worktree: ${outputDirectory}`,\n );\n const pathspec = relativeOutputDirectory || '.';\n const [statusOutput, trackedOutput] = await Promise.all([\n executeGit(\n ['status', '--porcelain=v1', '--untracked-files=all', '--', pathspec],\n repositoryRoot,\n ),\n executeGit(['ls-files', '-z', '--', pathspec], repositoryRoot),\n ]);\n const statusEntries = statusOutput.split('\\n').filter(Boolean);\n const trackedPaths = new Set(\n trackedOutput\n .split('\\0')\n .filter(Boolean)\n .map((trackedPath) =>\n toPosixPath(\n path.relative(canonicalOutputDirectory, path.join(repositoryRoot, trackedPath)),\n ),\n ),\n );\n const untrackedContent = existingFilePaths.filter((filePath) => !trackedPaths.has(filePath));\n const managed = trackedPaths.size > 0;\n const clean = managed && statusEntries.length === 0 && untrackedContent.length === 0;\n const fingerprint = digest(\n JSON.stringify({\n clean,\n managed,\n repositoryRoot,\n statusEntries,\n trackedPaths: [...trackedPaths].sort(),\n untrackedContent: [...untrackedContent].sort(),\n }),\n );\n\n return {\n clean,\n fingerprint,\n managed,\n repositoryRoot,\n statusEntries,\n untrackedContent,\n };\n}\n\nexport async function assertNoInterruptedRollback(outputDirectory: string): Promise<void> {\n const parentDirectory = path.dirname(outputDirectory);\n const outputName = path.basename(outputDirectory);\n const rollbackPrefixes = [`.${outputName}.rollback-`, `.${outputName}.backup-`];\n const leftovers = (await readdir(parentDirectory))\n .filter((entryName) => rollbackPrefixes.some((prefix) => entryName.startsWith(prefix)))\n .map((entryName) => path.join(parentDirectory, entryName));\n assert(\n leftovers.length === 0,\n `Found an interrupted SB3 import rollback directory. ` +\n `Inspect or restore it before retrying: ${leftovers.join(', ')}`,\n );\n}\n\nexport async function replaceDirectoryTransactionally(\n temporaryDirectory: string,\n outputDirectory: string,\n): Promise<{rollbackCleanupWarning: string | null}> {\n const parentDirectory = path.dirname(outputDirectory);\n await assertNoInterruptedRollback(outputDirectory);\n const rollbackDirectory = path.join(\n parentDirectory,\n `.${path.basename(outputDirectory)}.rollback-${randomUUID()}`,\n );\n assert(\n !(await pathExists(rollbackDirectory)),\n `Refusing to overwrite an existing rollback directory: ${rollbackDirectory}`,\n );\n const outputExists = await pathExists(outputDirectory);\n\n if (outputExists) {\n await rename(outputDirectory, rollbackDirectory);\n }\n\n try {\n await rename(temporaryDirectory, outputDirectory);\n } catch (installError) {\n if (outputExists) {\n try {\n await rename(rollbackDirectory, outputDirectory);\n } catch (restoreError) {\n throw new AggregateError(\n [installError, restoreError],\n `SB3 import failed and automatic restoration also failed. ` +\n `Original output remains at: ${rollbackDirectory}`,\n );\n }\n }\n throw installError;\n }\n\n if (!outputExists) {\n return {rollbackCleanupWarning: null};\n }\n\n try {\n await rm(rollbackDirectory, {recursive: true});\n return {rollbackCleanupWarning: null};\n } catch (error) {\n return {\n rollbackCleanupWarning:\n `Imported output was installed, but its temporary rollback ` +\n `directory could not be removed: ${rollbackDirectory} (${errorMessage(error)})`,\n };\n }\n}\n"],"mappings":"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"}
@@ -1,5 +1,12 @@
1
1
  import { EmbeddedExtension, ProjectJson, Sb3SourceManifest, UnknownRecord } from './types';
2
+ /** The source format version written for projects without block palette settings. */
2
3
  export declare const sourceFormatVersion = 1;
4
+ /** The source format version written for projects with `block-palette.json`. */
5
+ export declare const blockPaletteSourceFormatVersion = 2;
6
+ /** Every source format version that readers accept. */
7
+ export declare const supportedSourceFormatVersions: readonly number[];
8
+ /** `embedded-extensions.json` keeps its own version, independent of the source format. */
9
+ export declare const embeddedExtensionManifestFormatVersion = 1;
3
10
  export declare function isObject(value: unknown): value is UnknownRecord;
4
11
  export declare function assertSameFileSet(actualFiles: string[], expectedFiles: string[], description: string): void;
5
12
  export declare function validateSourceManifest(manifest: unknown): asserts manifest is Sb3SourceManifest;
@@ -1,7 +1,13 @@
1
1
  import { assert } from "./assert.js";
2
+ import { blockPaletteFile } from "./block-palette.js";
2
3
  import { validateArchiveEntryName } from "./archive.js";
3
4
  //#region src/source-format.ts
5
+ /** The source format version written for projects without block palette settings. */
4
6
  var sourceFormatVersion = 1;
7
+ /** The source format version written for projects with `block-palette.json`. */
8
+ var blockPaletteSourceFormatVersion = 2;
9
+ /** Every source format version that readers accept. */
10
+ var supportedSourceFormatVersions = [1, 2];
5
11
  function isObject(value) {
6
12
  return typeof value === "object" && value !== null && !Array.isArray(value);
7
13
  }
@@ -14,7 +20,9 @@ function assertSameFileSet(actualFiles, expectedFiles, description) {
14
20
  }
15
21
  function validateSourceManifest(manifest) {
16
22
  assert(isObject(manifest), "sb3-source.json must contain an object.");
17
- assert(manifest.formatVersion === 1, `Unsupported SB3 source format version: ${manifest.formatVersion}`);
23
+ assert(supportedSourceFormatVersions.includes(manifest.formatVersion), `Unsupported SB3 source format version: ${manifest.formatVersion}`);
24
+ if (manifest.formatVersion === 2) assert(manifest.blockPalette === blockPaletteFile, `SB3 source format 2 requires ${blockPaletteFile}.`);
25
+ else assert(manifest.blockPalette === void 0, "sb3-source.json blockPalette requires SB3 source format 2.");
18
26
  assert(manifest.project === "project.source.json", "SB3 source format 1 requires project.source.json.");
19
27
  assert(manifest.embeddedExtensions === "embedded-extensions.json", "SB3 source format 1 requires embedded-extensions.json.");
20
28
  assert(manifest.assetsDirectory === "assets", "SB3 source format 1 requires the assets directory.");
@@ -121,6 +129,6 @@ function collectSourceAssetReferences(project) {
121
129
  });
122
130
  }
123
131
  //#endregion
124
- export { assertSameFileSet, collectSourceAssetReferences, isObject, sourceFormatVersion, validateExtensionLayout, validateSourceManifest };
132
+ export { assertSameFileSet, blockPaletteSourceFormatVersion, collectSourceAssetReferences, isObject, sourceFormatVersion, supportedSourceFormatVersions, validateExtensionLayout, validateSourceManifest };
125
133
 
126
134
  //# sourceMappingURL=source-format.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"source-format.js","names":[],"sources":["../src/source-format.ts"],"sourcesContent":["// SPDX-License-Identifier: MPL-2.0\n\nimport {validateArchiveEntryName} from './archive';\nimport {assert} from './assert';\nimport type {\n EmbeddedExtension,\n ProjectAssetReference,\n ProjectJson,\n Sb3SourceManifest,\n UnknownRecord,\n} from './types';\n\nexport const sourceFormatVersion = 1;\n\nexport function isObject(value: unknown): value is UnknownRecord {\n return typeof value === 'object' && value !== null && !Array.isArray(value);\n}\n\nexport function assertSameFileSet(\n actualFiles: string[],\n expectedFiles: string[],\n description: string,\n): void {\n const actual = new Set(actualFiles);\n const expected = new Set(expectedFiles);\n const missing = [...expected].filter((filePath) => !actual.has(filePath)).sort();\n const extra = [...actual].filter((filePath) => !expected.has(filePath)).sort();\n assert(\n missing.length === 0 && extra.length === 0,\n `${description} does not match its manifest. Missing: ${missing.join(', ') || '(none)'}. ` +\n `Extra: ${extra.join(', ') || '(none)'}.`,\n );\n}\n\nexport function validateSourceManifest(manifest: unknown): asserts manifest is Sb3SourceManifest {\n assert(isObject(manifest), 'sb3-source.json must contain an object.');\n assert(\n manifest.formatVersion === sourceFormatVersion,\n `Unsupported SB3 source format version: ${manifest.formatVersion}`,\n );\n assert(\n manifest.project === 'project.source.json',\n 'SB3 source format 1 requires project.source.json.',\n );\n assert(\n manifest.embeddedExtensions === 'embedded-extensions.json',\n 'SB3 source format 1 requires embedded-extensions.json.',\n );\n assert(\n manifest.assetsDirectory === 'assets',\n 'SB3 source format 1 requires the assets directory.',\n );\n assert(\n Array.isArray(manifest.archiveEntries) && manifest.archiveEntries.length > 0,\n 'sb3-source.json archiveEntries must be a non-empty array.',\n );\n\n const seenEntries = new Set<string>();\n let projectEntryCount = 0;\n for (const rawEntryName of manifest.archiveEntries as unknown[]) {\n const entryName = validateArchiveEntryName(rawEntryName);\n assert(!seenEntries.has(entryName), `Duplicate archive entry in manifest: ${entryName}`);\n assert(\n !entryName.endsWith('/'),\n `Directory ZIP entries are not supported in SB3 source format 1: ${entryName}`,\n );\n assert(\n !/^(?:0|[1-9][0-9]*)$/u.test(entryName),\n `Integer-like ZIP entry names cannot preserve JavaScript object order: ${entryName}`,\n );\n seenEntries.add(entryName);\n if (entryName === 'project.json') {\n projectEntryCount += 1;\n }\n }\n assert(projectEntryCount === 1, 'archiveEntries must contain project.json exactly once.');\n}\n\nexport function validateExtensionLayout(\n extensionManifest: unknown,\n project: ProjectJson,\n extensionFiles: string[],\n validateManagedSource?: (extension: EmbeddedExtension) => unknown,\n): {extensionBundles: unknown; extensions: EmbeddedExtension[]} {\n assert(isObject(extensionManifest), 'embedded-extensions.json must contain an object.');\n assert(\n extensionManifest.formatVersion === sourceFormatVersion,\n `Unsupported embedded extension manifest version: ${extensionManifest.formatVersion}`,\n );\n assert(\n Array.isArray(extensionManifest.extensions),\n 'embedded-extensions.json extensions must be an array.',\n );\n\n const extensionUrls: unknown = project.extensionURLs ?? {};\n assert(\n isObject(extensionUrls),\n 'project.source.json extensionURLs must be an object when present.',\n );\n const extensionsById = new Map<string, EmbeddedExtension>();\n const expectedFiles: string[] = [];\n const extensions: EmbeddedExtension[] = [];\n\n for (const entry of extensionManifest.extensions as unknown[]) {\n assert(isObject(entry), 'Each embedded extension manifest entry must be an object.');\n const extension = entry as unknown as EmbeddedExtension;\n assert(\n typeof extension.id === 'string' && /^[A-Za-z0-9._-]+$/u.test(extension.id),\n `Invalid embedded extension ID: ${JSON.stringify(extension.id)}`,\n );\n assert(!extensionsById.has(extension.id), `Duplicate embedded extension ID: ${extension.id}`);\n const expectedPath = `extensions/${extension.id}.js`;\n assert(\n extension.path === expectedPath,\n `Embedded extension path must match its ID: expected ${expectedPath}, got ${extension.path}`,\n );\n assert(\n typeof extension.mediaType === 'string' &&\n extension.mediaType.length > 0 &&\n !/[;,\\r\\n]/u.test(extension.mediaType),\n `Invalid media type for embedded extension ${extension.id}: ${extension.mediaType}`,\n );\n assert(\n Array.isArray(extension.parameters) &&\n extension.parameters.every(\n (parameter) =>\n typeof parameter === 'string' && parameter.length > 0 && !/[;,\\r\\n]/u.test(parameter),\n ),\n `Invalid data URL parameters for embedded extension ${extension.id}.`,\n );\n assert(\n extension.encoding === 'base64' || extension.encoding === 'percent',\n `Unsupported encoding for embedded extension ${extension.id}: ${extension.encoding}`,\n );\n assert(\n extensionUrls[extension.id] === `embedded-extension:${extension.path}`,\n `project.source.json mapping does not match embedded extension ${extension.id}.`,\n );\n if (extension.source !== undefined) {\n assert(isObject(extension.source), `Invalid source for embedded extension ${extension.id}.`);\n const sidecar = extension.source.apiManifest;\n assert(\n sidecar === undefined ||\n (isObject(sidecar) && sidecar.path === `extensions/${extension.id}.manifest.json`),\n `Invalid API manifest path for embedded extension ${extension.id}.`,\n );\n }\n validateManagedSource?.(extension);\n extensionsById.set(extension.id, extension);\n extensions.push(extension);\n expectedFiles.push(`${extension.id}.js`);\n if (extension.source?.apiManifest) {\n expectedFiles.push(extension.source.apiManifest.path.slice('extensions/'.length));\n }\n }\n\n for (const [extensionId, extensionUrl] of Object.entries(extensionUrls)) {\n assert(\n typeof extensionUrl !== 'string' || !extensionUrl.startsWith('data:'),\n `project.source.json still contains an embedded data URL: ${extensionId}`,\n );\n if (typeof extensionUrl === 'string' && extensionUrl.startsWith('embedded-extension:')) {\n assert(\n extensionsById.has(extensionId),\n `project.source.json has no metadata for embedded extension ${extensionId}.`,\n );\n }\n }\n\n assertSameFileSet(extensionFiles, expectedFiles, 'Embedded extension files');\n return {\n extensionBundles: extensionManifest.extensionBundles,\n extensions,\n };\n}\n\nfunction collectAssetReferences(\n project: ProjectJson,\n): {asset: ProjectAssetReference; description: string}[] {\n assert(Array.isArray(project.targets), 'project.source.json targets must be an array.');\n const references: {asset: ProjectAssetReference; description: string}[] = [];\n for (const [targetIndex, target] of (project.targets as unknown[]).entries()) {\n assert(isObject(target), `Project target ${targetIndex} must be an object.`);\n for (const [collectionName, kind] of [\n ['costumes', 'costume'],\n ['sounds', 'sound'],\n ] as const) {\n const assets: unknown = target[collectionName] ?? [];\n assert(\n Array.isArray(assets),\n `Project target ${targetIndex} ${collectionName} must be an array.`,\n );\n for (const [assetIndex, asset] of (assets as unknown[]).entries()) {\n assert(isObject(asset), `Project ${kind} ${targetIndex}:${assetIndex} must be an object.`);\n references.push({asset, description: `${kind} ${targetIndex}:${assetIndex}`});\n }\n }\n }\n const fonts = project.customFonts ?? [];\n assert(Array.isArray(fonts), 'project.source.json customFonts must be an array.');\n for (const [index, font] of fonts.entries()) {\n if (!isObject(font) || font.system !== false || font.md5ext === undefined) continue;\n const md5ext = font.md5ext;\n const match = typeof md5ext === 'string' && /^([a-f0-9]{32})\\.(ttf|otf|woff2?)$/u.exec(md5ext);\n assert(match, `Invalid font asset reference for font ${index}: ${md5ext}`);\n const [, assetId, dataFormat] = match;\n references.push({asset: {assetId, dataFormat, md5ext}, description: `font ${index}`});\n }\n return references;\n}\n\nexport function collectSourceAssetReferences(\n project: ProjectJson,\n): {filename: string; description: string}[] {\n return collectAssetReferences(project).map(({asset, description}) => {\n assert(\n typeof asset.assetId === 'string' && /^[a-f0-9]{32}$/u.test(asset.assetId),\n `Invalid assetId for ${description}: ${asset.assetId}`,\n );\n assert(\n typeof asset.dataFormat === 'string' && /^[A-Za-z0-9]+$/u.test(asset.dataFormat),\n `Invalid dataFormat for ${description}: ${asset.dataFormat}`,\n );\n const expectedFilename = `${asset.assetId}.${asset.dataFormat}`;\n assert(\n asset.md5ext === expectedFilename,\n `Asset filename mismatch for ${description}: expected ${expectedFilename}, got ${asset.md5ext}`,\n );\n return {filename: expectedFilename, description};\n });\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"source-format.js","names":[],"sources":["../src/source-format.ts"],"sourcesContent":["// SPDX-License-Identifier: MPL-2.0\n\nimport {validateArchiveEntryName} from './archive';\nimport {assert} from './assert';\nimport {blockPaletteFile} from './block-palette';\nimport type {\n EmbeddedExtension,\n ProjectAssetReference,\n ProjectJson,\n Sb3SourceManifest,\n UnknownRecord,\n} from './types';\n\n/** The source format version written for projects without block palette settings. */\nexport const sourceFormatVersion = 1;\n/** The source format version written for projects with `block-palette.json`. */\nexport const blockPaletteSourceFormatVersion = 2;\n/** Every source format version that readers accept. */\nexport const supportedSourceFormatVersions: readonly number[] = [1, 2];\n/** `embedded-extensions.json` keeps its own version, independent of the source format. */\nexport const embeddedExtensionManifestFormatVersion = 1;\n\nexport function isObject(value: unknown): value is UnknownRecord {\n return typeof value === 'object' && value !== null && !Array.isArray(value);\n}\n\nexport function assertSameFileSet(\n actualFiles: string[],\n expectedFiles: string[],\n description: string,\n): void {\n const actual = new Set(actualFiles);\n const expected = new Set(expectedFiles);\n const missing = [...expected].filter((filePath) => !actual.has(filePath)).sort();\n const extra = [...actual].filter((filePath) => !expected.has(filePath)).sort();\n assert(\n missing.length === 0 && extra.length === 0,\n `${description} does not match its manifest. Missing: ${missing.join(', ') || '(none)'}. ` +\n `Extra: ${extra.join(', ') || '(none)'}.`,\n );\n}\n\nexport function validateSourceManifest(manifest: unknown): asserts manifest is Sb3SourceManifest {\n assert(isObject(manifest), 'sb3-source.json must contain an object.');\n assert(\n supportedSourceFormatVersions.includes(manifest.formatVersion as number),\n `Unsupported SB3 source format version: ${manifest.formatVersion}`,\n );\n if (manifest.formatVersion === blockPaletteSourceFormatVersion) {\n assert(\n manifest.blockPalette === blockPaletteFile,\n `SB3 source format 2 requires ${blockPaletteFile}.`,\n );\n } else {\n assert(\n manifest.blockPalette === undefined,\n 'sb3-source.json blockPalette requires SB3 source format 2.',\n );\n }\n assert(\n manifest.project === 'project.source.json',\n 'SB3 source format 1 requires project.source.json.',\n );\n assert(\n manifest.embeddedExtensions === 'embedded-extensions.json',\n 'SB3 source format 1 requires embedded-extensions.json.',\n );\n assert(\n manifest.assetsDirectory === 'assets',\n 'SB3 source format 1 requires the assets directory.',\n );\n assert(\n Array.isArray(manifest.archiveEntries) && manifest.archiveEntries.length > 0,\n 'sb3-source.json archiveEntries must be a non-empty array.',\n );\n\n const seenEntries = new Set<string>();\n let projectEntryCount = 0;\n for (const rawEntryName of manifest.archiveEntries as unknown[]) {\n const entryName = validateArchiveEntryName(rawEntryName);\n assert(!seenEntries.has(entryName), `Duplicate archive entry in manifest: ${entryName}`);\n assert(\n !entryName.endsWith('/'),\n `Directory ZIP entries are not supported in SB3 source format 1: ${entryName}`,\n );\n assert(\n !/^(?:0|[1-9][0-9]*)$/u.test(entryName),\n `Integer-like ZIP entry names cannot preserve JavaScript object order: ${entryName}`,\n );\n seenEntries.add(entryName);\n if (entryName === 'project.json') {\n projectEntryCount += 1;\n }\n }\n assert(projectEntryCount === 1, 'archiveEntries must contain project.json exactly once.');\n}\n\nexport function validateExtensionLayout(\n extensionManifest: unknown,\n project: ProjectJson,\n extensionFiles: string[],\n validateManagedSource?: (extension: EmbeddedExtension) => unknown,\n): {extensionBundles: unknown; extensions: EmbeddedExtension[]} {\n assert(isObject(extensionManifest), 'embedded-extensions.json must contain an object.');\n assert(\n extensionManifest.formatVersion === embeddedExtensionManifestFormatVersion,\n `Unsupported embedded extension manifest version: ${extensionManifest.formatVersion}`,\n );\n assert(\n Array.isArray(extensionManifest.extensions),\n 'embedded-extensions.json extensions must be an array.',\n );\n\n const extensionUrls: unknown = project.extensionURLs ?? {};\n assert(\n isObject(extensionUrls),\n 'project.source.json extensionURLs must be an object when present.',\n );\n const extensionsById = new Map<string, EmbeddedExtension>();\n const expectedFiles: string[] = [];\n const extensions: EmbeddedExtension[] = [];\n\n for (const entry of extensionManifest.extensions as unknown[]) {\n assert(isObject(entry), 'Each embedded extension manifest entry must be an object.');\n const extension = entry as unknown as EmbeddedExtension;\n assert(\n typeof extension.id === 'string' && /^[A-Za-z0-9._-]+$/u.test(extension.id),\n `Invalid embedded extension ID: ${JSON.stringify(extension.id)}`,\n );\n assert(!extensionsById.has(extension.id), `Duplicate embedded extension ID: ${extension.id}`);\n const expectedPath = `extensions/${extension.id}.js`;\n assert(\n extension.path === expectedPath,\n `Embedded extension path must match its ID: expected ${expectedPath}, got ${extension.path}`,\n );\n assert(\n typeof extension.mediaType === 'string' &&\n extension.mediaType.length > 0 &&\n !/[;,\\r\\n]/u.test(extension.mediaType),\n `Invalid media type for embedded extension ${extension.id}: ${extension.mediaType}`,\n );\n assert(\n Array.isArray(extension.parameters) &&\n extension.parameters.every(\n (parameter) =>\n typeof parameter === 'string' && parameter.length > 0 && !/[;,\\r\\n]/u.test(parameter),\n ),\n `Invalid data URL parameters for embedded extension ${extension.id}.`,\n );\n assert(\n extension.encoding === 'base64' || extension.encoding === 'percent',\n `Unsupported encoding for embedded extension ${extension.id}: ${extension.encoding}`,\n );\n assert(\n extensionUrls[extension.id] === `embedded-extension:${extension.path}`,\n `project.source.json mapping does not match embedded extension ${extension.id}.`,\n );\n if (extension.source !== undefined) {\n assert(isObject(extension.source), `Invalid source for embedded extension ${extension.id}.`);\n const sidecar = extension.source.apiManifest;\n assert(\n sidecar === undefined ||\n (isObject(sidecar) && sidecar.path === `extensions/${extension.id}.manifest.json`),\n `Invalid API manifest path for embedded extension ${extension.id}.`,\n );\n }\n validateManagedSource?.(extension);\n extensionsById.set(extension.id, extension);\n extensions.push(extension);\n expectedFiles.push(`${extension.id}.js`);\n if (extension.source?.apiManifest) {\n expectedFiles.push(extension.source.apiManifest.path.slice('extensions/'.length));\n }\n }\n\n for (const [extensionId, extensionUrl] of Object.entries(extensionUrls)) {\n assert(\n typeof extensionUrl !== 'string' || !extensionUrl.startsWith('data:'),\n `project.source.json still contains an embedded data URL: ${extensionId}`,\n );\n if (typeof extensionUrl === 'string' && extensionUrl.startsWith('embedded-extension:')) {\n assert(\n extensionsById.has(extensionId),\n `project.source.json has no metadata for embedded extension ${extensionId}.`,\n );\n }\n }\n\n assertSameFileSet(extensionFiles, expectedFiles, 'Embedded extension files');\n return {\n extensionBundles: extensionManifest.extensionBundles,\n extensions,\n };\n}\n\nfunction collectAssetReferences(\n project: ProjectJson,\n): {asset: ProjectAssetReference; description: string}[] {\n assert(Array.isArray(project.targets), 'project.source.json targets must be an array.');\n const references: {asset: ProjectAssetReference; description: string}[] = [];\n for (const [targetIndex, target] of (project.targets as unknown[]).entries()) {\n assert(isObject(target), `Project target ${targetIndex} must be an object.`);\n for (const [collectionName, kind] of [\n ['costumes', 'costume'],\n ['sounds', 'sound'],\n ] as const) {\n const assets: unknown = target[collectionName] ?? [];\n assert(\n Array.isArray(assets),\n `Project target ${targetIndex} ${collectionName} must be an array.`,\n );\n for (const [assetIndex, asset] of (assets as unknown[]).entries()) {\n assert(isObject(asset), `Project ${kind} ${targetIndex}:${assetIndex} must be an object.`);\n references.push({asset, description: `${kind} ${targetIndex}:${assetIndex}`});\n }\n }\n }\n const fonts = project.customFonts ?? [];\n assert(Array.isArray(fonts), 'project.source.json customFonts must be an array.');\n for (const [index, font] of fonts.entries()) {\n if (!isObject(font) || font.system !== false || font.md5ext === undefined) continue;\n const md5ext = font.md5ext;\n const match = typeof md5ext === 'string' && /^([a-f0-9]{32})\\.(ttf|otf|woff2?)$/u.exec(md5ext);\n assert(match, `Invalid font asset reference for font ${index}: ${md5ext}`);\n const [, assetId, dataFormat] = match;\n references.push({asset: {assetId, dataFormat, md5ext}, description: `font ${index}`});\n }\n return references;\n}\n\nexport function collectSourceAssetReferences(\n project: ProjectJson,\n): {filename: string; description: string}[] {\n return collectAssetReferences(project).map(({asset, description}) => {\n assert(\n typeof asset.assetId === 'string' && /^[a-f0-9]{32}$/u.test(asset.assetId),\n `Invalid assetId for ${description}: ${asset.assetId}`,\n );\n assert(\n typeof asset.dataFormat === 'string' && /^[A-Za-z0-9]+$/u.test(asset.dataFormat),\n `Invalid dataFormat for ${description}: ${asset.dataFormat}`,\n );\n const expectedFilename = `${asset.assetId}.${asset.dataFormat}`;\n assert(\n asset.md5ext === expectedFilename,\n `Asset filename mismatch for ${description}: expected ${expectedFilename}, got ${asset.md5ext}`,\n );\n return {filename: expectedFilename, description};\n });\n}\n"],"mappings":"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"}
package/dist/source.d.ts CHANGED
@@ -1,11 +1,14 @@
1
+ import { BlockPaletteDocument } from './block-palette';
1
2
  import { ExtensionBundlePlan } from './extension-bundle';
2
3
  import { ProjectAssetAdditionsSummary } from './project-asset-additions';
3
4
  import { EmbeddedExtension, ExtensionBundleConfiguration, ProjectJson, Sb3SourceManifest } from './types';
4
- export { sourceFormatVersion } from './source-format';
5
+ export { blockPaletteSourceFormatVersion, sourceFormatVersion, supportedSourceFormatVersions, } from './source-format';
5
6
  export declare const fixedZipTimestamp: Date;
6
7
  export interface InspectedSb3Source {
7
8
  assetContents: Map<string, Uint8Array>;
8
9
  assetReferenceCount: number;
10
+ /** `block-palette.json` in source format 2, otherwise null. */
11
+ blockPalette: BlockPaletteDocument | null;
9
12
  extensions: EmbeddedExtension[];
10
13
  extensionApiManifestContents: Map<string, Uint8Array>;
11
14
  extensionBundles: ExtensionBundleConfiguration[];
package/dist/source.js CHANGED
@@ -1,11 +1,12 @@
1
1
  import { assert, errorMessage } from "./assert.js";
2
+ import { applyBlockPaletteComments, resolveBlockPaletteReferences, validateBlockPaletteDocument } from "./block-palette.js";
2
3
  import { validateManagedExtensionApiManifest } from "./extension-api-manifest.js";
3
4
  import { validateExtensionSourceMetadata, validateManagedExtensionContents } from "./extension-dependencies.js";
4
5
  import { validateExtensionBundleConfigurations } from "./extension-bundle.js";
5
6
  import { buildExtensionBundlesWithModules } from "./extension-module-bundle.js";
6
7
  import { applyProjectAssetAdditions } from "./project-asset-additions.js";
7
8
  import { cleanUpTurboWarpBlocks } from "./turbowarp-clean-up.js";
8
- import { assertSameFileSet, collectSourceAssetReferences, isObject, sourceFormatVersion, validateExtensionLayout, validateSourceManifest } from "./source-format.js";
9
+ import { assertSameFileSet, blockPaletteSourceFormatVersion, collectSourceAssetReferences, isObject, sourceFormatVersion, supportedSourceFormatVersions, validateExtensionLayout, validateSourceManifest } from "./source-format.js";
9
10
  import path from "node:path";
10
11
  import { createHash } from "node:crypto";
11
12
  import { lstat, readFile, readdir } from "node:fs/promises";
@@ -66,6 +67,8 @@ async function inspectSb3Source(sourceDirectory, validateManagedExtensions) {
66
67
  const assetEntries = sourceManifest.archiveEntries.filter((entryName) => entryName !== "project.json");
67
68
  const project = await readJson(path.join(resolvedSourceDirectory, sourceManifest.project), "SB3 project source");
68
69
  assert(isObject(project), "project.source.json must contain an object.");
70
+ const blockPalette = sourceManifest.blockPalette === void 0 ? null : validateBlockPaletteDocument(await readJson(path.join(resolvedSourceDirectory, sourceManifest.blockPalette), "Block palette settings"));
71
+ resolveBlockPaletteReferences(project, blockPalette);
69
72
  const extensionManifest = await readJson(path.join(resolvedSourceDirectory, sourceManifest.embeddedExtensions), "Embedded extension manifest");
70
73
  const assetsDirectory = path.join(resolvedSourceDirectory, sourceManifest.assetsDirectory);
71
74
  const extensionsDirectory = path.join(resolvedSourceDirectory, "extensions");
@@ -105,6 +108,7 @@ async function inspectSb3Source(sourceDirectory, validateManagedExtensions) {
105
108
  return {
106
109
  assetContents,
107
110
  assetReferenceCount: references.length,
111
+ blockPalette,
108
112
  extensions,
109
113
  extensionApiManifestContents,
110
114
  extensionBundles,
@@ -166,6 +170,7 @@ async function createDeterministicSb3(sourceDirectory, options = {}) {
166
170
  targetCount: cleaned.targetCount
167
171
  };
168
172
  }
173
+ applyBlockPaletteComments(project, source.blockPalette);
169
174
  const extensionUrls = project.extensionURLs ?? {};
170
175
  for (const extension of bundled.extensions) {
171
176
  const contents = bundled.extensionContents.get(extension.id);
@@ -199,6 +204,6 @@ async function createDeterministicSb3(sourceDirectory, options = {}) {
199
204
  };
200
205
  }
201
206
  //#endregion
202
- export { createDeterministicSb3, fixedZipTimestamp, inspectSb3SourceForExtensionSync, sourceFormatVersion, validateSb3Source };
207
+ export { blockPaletteSourceFormatVersion, createDeterministicSb3, fixedZipTimestamp, inspectSb3SourceForExtensionSync, sourceFormatVersion, supportedSourceFormatVersions, validateSb3Source };
203
208
 
204
209
  //# sourceMappingURL=source.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"source.js","names":[],"sources":["../src/source.ts"],"sourcesContent":["// SPDX-License-Identifier: MPL-2.0\n\nimport {createHash} from 'node:crypto';\nimport {lstat, readdir, readFile} from 'node:fs/promises';\nimport path from 'node:path';\n\nimport {strToU8, zipSync} from 'fflate';\n\nimport {assert, errorMessage} from './assert';\nimport {validateManagedExtensionApiManifest} from './extension-api-manifest';\nimport {validateExtensionBundleConfigurations} from './extension-bundle';\nimport {buildExtensionBundlesWithModules} from './extension-module-bundle';\nimport type {ExtensionBundlePlan} from './extension-bundle';\nimport {\n validateExtensionSourceMetadata,\n validateManagedExtensionContents,\n} from './extension-dependencies';\nimport {applyProjectAssetAdditions} from './project-asset-additions';\nimport type {ProjectAssetAdditionsSummary} from './project-asset-additions';\nimport {cleanUpTurboWarpBlocks} from './turbowarp-clean-up';\nimport {\n assertSameFileSet,\n collectSourceAssetReferences,\n isObject,\n validateExtensionLayout,\n validateSourceManifest,\n} from './source-format';\nimport type {\n EmbeddedExtension,\n ExtensionBundleConfiguration,\n ProjectJson,\n Sb3SourceManifest,\n} from './types';\n\nexport {sourceFormatVersion} from './source-format';\nexport const fixedZipTimestamp = new Date(1980, 0, 1, 0, 0, 0, 0);\n\nexport interface InspectedSb3Source {\n assetContents: Map<string, Uint8Array>;\n assetReferenceCount: number;\n extensions: EmbeddedExtension[];\n extensionApiManifestContents: Map<string, Uint8Array>;\n extensionBundles: ExtensionBundleConfiguration[];\n extensionContents: Map<string, Uint8Array>;\n project: ProjectJson;\n resolvedSourceDirectory: string;\n sourceManifest: Sb3SourceManifest;\n}\n\nexport interface BlockCleanUpSummary {\n movedCommentCount: number;\n movedScriptCount: number;\n scriptCount: number;\n targetCount: number;\n}\n\nexport interface DeterministicSb3Options {\n allowedAssetRoots?: string[];\n cleanUpBlocks?: boolean;\n projectAssetsPath?: string;\n}\n\nexport interface DeterministicSb3 {\n archive: Uint8Array;\n assetCount: number;\n assetReferenceCount: number;\n blockCleanUp: BlockCleanUpSummary | null;\n bundlePlans: ExtensionBundlePlan[];\n embeddedExtensionCount: number;\n entryCount: number;\n projectAssetAdditions: Readonly<ProjectAssetAdditionsSummary> | null;\n source: InspectedSb3Source;\n}\n\nasync function readJson(filePath: string, description: string): Promise<unknown> {\n try {\n return JSON.parse(await readFile(filePath, 'utf8'));\n } catch (error) {\n throw new Error(`${description} is not valid JSON: ${filePath} (${errorMessage(error)})`, {\n cause: error,\n });\n }\n}\n\nasync function assertDirectory(directoryPath: string, description: string): Promise<void> {\n const stats = await lstat(directoryPath);\n assert(\n stats.isDirectory() && !stats.isSymbolicLink(),\n `${description} must be a directory, not a file or symbolic link: ${directoryPath}`,\n );\n}\n\nasync function listRegularFiles(rootDirectory: string, description: string): Promise<string[]> {\n try {\n await assertDirectory(rootDirectory, description);\n } catch (error) {\n if ((error as NodeJS.ErrnoException).code === 'ENOENT') return [];\n throw error;\n }\n const files: string[] = [];\n\n async function visit(directory: string, relativeDirectory: string): Promise<void> {\n const entries = await readdir(directory, {withFileTypes: true});\n entries.sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));\n for (const entry of entries) {\n const relativePath = relativeDirectory\n ? path.posix.join(relativeDirectory, entry.name)\n : entry.name;\n const absolutePath = path.join(directory, entry.name);\n if (entry.isDirectory()) {\n await visit(absolutePath, relativePath);\n } else {\n assert(\n entry.isFile(),\n `${description} contains a symbolic link or unsupported entry: ${relativePath}`,\n );\n files.push(relativePath);\n }\n }\n }\n\n await visit(rootDirectory, '');\n return files;\n}\n\nfunction md5(contents: Uint8Array | string): string {\n return createHash('md5').update(contents).digest('hex');\n}\n\nfunction percentEncode(contents: Uint8Array): string {\n return [...contents]\n .map((byte) => `%${byte.toString(16).padStart(2, '0').toUpperCase()}`)\n .join('');\n}\n\nfunction encodeExtensionDataUrl(extension: EmbeddedExtension, contents: Uint8Array): string {\n const metadata = [extension.mediaType, ...extension.parameters].join(';');\n if (extension.encoding === 'base64') {\n return `data:${metadata};base64,${Buffer.from(contents).toString('base64')}`;\n }\n return `data:${metadata},${percentEncode(contents)}`;\n}\n\nasync function inspectSb3Source(\n sourceDirectory: string,\n validateManagedExtensions: boolean,\n): Promise<InspectedSb3Source> {\n const resolvedSourceDirectory = path.resolve(sourceDirectory);\n await assertDirectory(resolvedSourceDirectory, 'SB3 source');\n const sourceManifest = await readJson(\n path.join(resolvedSourceDirectory, 'sb3-source.json'),\n 'SB3 source manifest',\n );\n validateSourceManifest(sourceManifest);\n const assetEntries = sourceManifest.archiveEntries.filter(\n (entryName) => entryName !== 'project.json',\n );\n const project: unknown = await readJson(\n path.join(resolvedSourceDirectory, sourceManifest.project),\n 'SB3 project source',\n );\n assert(isObject(project), 'project.source.json must contain an object.');\n const extensionManifest = await readJson(\n path.join(resolvedSourceDirectory, sourceManifest.embeddedExtensions),\n 'Embedded extension manifest',\n );\n\n const assetsDirectory = path.join(resolvedSourceDirectory, sourceManifest.assetsDirectory);\n const extensionsDirectory = path.join(resolvedSourceDirectory, 'extensions');\n const [assetFiles, extensionFiles] = await Promise.all([\n listRegularFiles(assetsDirectory, 'Assets directory'),\n listRegularFiles(extensionsDirectory, 'Extensions directory'),\n ]);\n assertSameFileSet(assetFiles, assetEntries, 'Asset files');\n const {extensionBundles: bundleConfiguration, extensions} = validateExtensionLayout(\n extensionManifest,\n project,\n extensionFiles,\n validateExtensionSourceMetadata,\n );\n const extensionBundles = validateExtensionBundleConfigurations(bundleConfiguration, extensions);\n\n const assetContents = new Map<string, Uint8Array>();\n await Promise.all(\n assetFiles.map(async (assetPath) => {\n assetContents.set(assetPath, await readFile(path.join(assetsDirectory, assetPath)));\n }),\n );\n const references = collectSourceAssetReferences(project);\n const referencedAssets = new Set<string>();\n for (const {filename, description} of references) {\n if (referencedAssets.has(filename)) continue;\n const contents = assetContents.get(filename);\n assert(contents, `Referenced asset is missing for ${description}: ${filename}`);\n const assetId = filename.slice(0, 32);\n const actualAssetId = md5(contents);\n assert(\n actualAssetId === assetId,\n `Asset content hash mismatch for ${description}: expected ${assetId}, got ${actualAssetId}`,\n );\n referencedAssets.add(filename);\n }\n const unreferencedAssets = assetFiles.filter((assetPath) => !referencedAssets.has(assetPath));\n assert(\n unreferencedAssets.length === 0,\n `Asset manifest contains unreferenced files: ${unreferencedAssets.join(', ')}`,\n );\n\n const extensionContents = new Map<string, Uint8Array>();\n const extensionApiManifestContents = new Map<string, Uint8Array>();\n await Promise.all(\n extensions.map(async (extension) => {\n const contents = await readFile(path.join(resolvedSourceDirectory, extension.path));\n if (validateManagedExtensions) {\n validateManagedExtensionContents(extension, contents);\n }\n extensionContents.set(extension.id, contents);\n if (extension.source?.apiManifest) {\n const apiManifestContents = await readFile(\n path.join(resolvedSourceDirectory, extension.source.apiManifest.path),\n );\n if (validateManagedExtensions) {\n validateManagedExtensionApiManifest(extension, apiManifestContents);\n }\n extensionApiManifestContents.set(extension.id, apiManifestContents);\n }\n }),\n );\n\n return {\n assetContents,\n assetReferenceCount: references.length,\n extensions,\n extensionApiManifestContents,\n extensionBundles,\n extensionContents,\n project,\n resolvedSourceDirectory,\n sourceManifest,\n };\n}\n\nexport async function inspectSb3SourceForExtensionSync(\n sourceDirectory: string,\n): Promise<InspectedSb3Source> {\n return inspectSb3Source(sourceDirectory, false);\n}\n\nexport async function validateSb3Source(sourceDirectory: string): Promise<InspectedSb3Source> {\n const source = await inspectSb3Source(sourceDirectory, true);\n await buildExtensionBundlesWithModules({\n sourceDirectory: source.resolvedSourceDirectory,\n extensionBundles: source.extensionBundles,\n extensionContents: source.extensionContents,\n extensions: source.extensions,\n project: source.project,\n });\n return source;\n}\n\nexport async function createDeterministicSb3(\n sourceDirectory: string,\n options: DeterministicSb3Options = {},\n): Promise<DeterministicSb3> {\n const {allowedAssetRoots = [], cleanUpBlocks = false, projectAssetsPath} = options;\n assert(typeof cleanUpBlocks === 'boolean', 'cleanUpBlocks must be a boolean.');\n assert(Array.isArray(allowedAssetRoots), 'allowedAssetRoots must be an array.');\n assert(\n projectAssetsPath === undefined || typeof projectAssetsPath === 'string',\n 'projectAssetsPath must be a string when provided.',\n );\n const source = await inspectSb3Source(sourceDirectory, true);\n const projectAssets: {\n archiveEntries: string[];\n assetContents: Map<string, Uint8Array>;\n assetReferenceCount: number;\n project: ProjectJson;\n summary: Readonly<ProjectAssetAdditionsSummary> | null;\n } = projectAssetsPath\n ? await applyProjectAssetAdditions({\n allowedAssetRoots,\n assetContents: source.assetContents,\n archiveEntries: source.sourceManifest.archiveEntries,\n manifestPath: projectAssetsPath,\n project: source.project,\n })\n : {\n archiveEntries: source.sourceManifest.archiveEntries,\n assetContents: source.assetContents,\n assetReferenceCount: 0,\n project: source.project,\n summary: null,\n };\n const bundled = await buildExtensionBundlesWithModules({\n sourceDirectory: source.resolvedSourceDirectory,\n extensionBundles: source.extensionBundles,\n extensionContents: source.extensionContents,\n extensions: source.extensions,\n project: projectAssets.project,\n });\n let project = structuredClone(bundled.project);\n let blockCleanUp: BlockCleanUpSummary | null = null;\n if (cleanUpBlocks) {\n const cleaned = cleanUpTurboWarpBlocks(project);\n project = cleaned.project;\n blockCleanUp = {\n movedCommentCount: cleaned.movedCommentCount,\n movedScriptCount: cleaned.movedScriptCount,\n scriptCount: cleaned.scriptCount,\n targetCount: cleaned.targetCount,\n };\n }\n const extensionUrls: Record<string, unknown> = project.extensionURLs ?? {};\n for (const extension of bundled.extensions) {\n const contents = bundled.extensionContents.get(extension.id);\n assert(contents, `Embedded extension has no contents: ${extension.id}`);\n extensionUrls[extension.id] = encodeExtensionDataUrl(extension, contents);\n }\n project.extensionURLs = extensionUrls;\n\n const archiveEntries: Record<string, Uint8Array> = {};\n for (const entryName of projectAssets.archiveEntries) {\n if (entryName === 'project.json') {\n archiveEntries[entryName] = strToU8(`${JSON.stringify(project)}\\n`);\n continue;\n }\n const contents = projectAssets.assetContents.get(entryName);\n assert(contents, `Archive entry has no contents: ${entryName}`);\n archiveEntries[entryName] = contents;\n }\n const archive = zipSync(archiveEntries, {\n level: 6,\n mtime: fixedZipTimestamp,\n });\n\n return {\n archive,\n assetCount: projectAssets.assetContents.size,\n assetReferenceCount: source.assetReferenceCount + projectAssets.assetReferenceCount,\n blockCleanUp,\n bundlePlans: bundled.bundlePlans,\n embeddedExtensionCount: bundled.extensions.length,\n entryCount: projectAssets.archiveEntries.length,\n projectAssetAdditions: projectAssets.summary,\n source,\n };\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"source.js","names":[],"sources":["../src/source.ts"],"sourcesContent":["// SPDX-License-Identifier: MPL-2.0\n\nimport {createHash} from 'node:crypto';\nimport {lstat, readdir, readFile} from 'node:fs/promises';\nimport path from 'node:path';\n\nimport {strToU8, zipSync} from 'fflate';\n\nimport {assert, errorMessage} from './assert';\nimport {\n applyBlockPaletteComments,\n resolveBlockPaletteReferences,\n validateBlockPaletteDocument,\n} from './block-palette';\nimport type {BlockPaletteDocument} from './block-palette';\nimport {validateManagedExtensionApiManifest} from './extension-api-manifest';\nimport {validateExtensionBundleConfigurations} from './extension-bundle';\nimport {buildExtensionBundlesWithModules} from './extension-module-bundle';\nimport type {ExtensionBundlePlan} from './extension-bundle';\nimport {\n validateExtensionSourceMetadata,\n validateManagedExtensionContents,\n} from './extension-dependencies';\nimport {applyProjectAssetAdditions} from './project-asset-additions';\nimport type {ProjectAssetAdditionsSummary} from './project-asset-additions';\nimport {cleanUpTurboWarpBlocks} from './turbowarp-clean-up';\nimport {\n assertSameFileSet,\n collectSourceAssetReferences,\n isObject,\n validateExtensionLayout,\n validateSourceManifest,\n} from './source-format';\nimport type {\n EmbeddedExtension,\n ExtensionBundleConfiguration,\n ProjectJson,\n Sb3SourceManifest,\n} from './types';\n\nexport {\n blockPaletteSourceFormatVersion,\n sourceFormatVersion,\n supportedSourceFormatVersions,\n} from './source-format';\nexport const fixedZipTimestamp = new Date(1980, 0, 1, 0, 0, 0, 0);\n\nexport interface InspectedSb3Source {\n assetContents: Map<string, Uint8Array>;\n assetReferenceCount: number;\n /** `block-palette.json` in source format 2, otherwise null. */\n blockPalette: BlockPaletteDocument | null;\n extensions: EmbeddedExtension[];\n extensionApiManifestContents: Map<string, Uint8Array>;\n extensionBundles: ExtensionBundleConfiguration[];\n extensionContents: Map<string, Uint8Array>;\n project: ProjectJson;\n resolvedSourceDirectory: string;\n sourceManifest: Sb3SourceManifest;\n}\n\nexport interface BlockCleanUpSummary {\n movedCommentCount: number;\n movedScriptCount: number;\n scriptCount: number;\n targetCount: number;\n}\n\nexport interface DeterministicSb3Options {\n allowedAssetRoots?: string[];\n cleanUpBlocks?: boolean;\n projectAssetsPath?: string;\n}\n\nexport interface DeterministicSb3 {\n archive: Uint8Array;\n assetCount: number;\n assetReferenceCount: number;\n blockCleanUp: BlockCleanUpSummary | null;\n bundlePlans: ExtensionBundlePlan[];\n embeddedExtensionCount: number;\n entryCount: number;\n projectAssetAdditions: Readonly<ProjectAssetAdditionsSummary> | null;\n source: InspectedSb3Source;\n}\n\nasync function readJson(filePath: string, description: string): Promise<unknown> {\n try {\n return JSON.parse(await readFile(filePath, 'utf8'));\n } catch (error) {\n throw new Error(`${description} is not valid JSON: ${filePath} (${errorMessage(error)})`, {\n cause: error,\n });\n }\n}\n\nasync function assertDirectory(directoryPath: string, description: string): Promise<void> {\n const stats = await lstat(directoryPath);\n assert(\n stats.isDirectory() && !stats.isSymbolicLink(),\n `${description} must be a directory, not a file or symbolic link: ${directoryPath}`,\n );\n}\n\nasync function listRegularFiles(rootDirectory: string, description: string): Promise<string[]> {\n try {\n await assertDirectory(rootDirectory, description);\n } catch (error) {\n if ((error as NodeJS.ErrnoException).code === 'ENOENT') return [];\n throw error;\n }\n const files: string[] = [];\n\n async function visit(directory: string, relativeDirectory: string): Promise<void> {\n const entries = await readdir(directory, {withFileTypes: true});\n entries.sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));\n for (const entry of entries) {\n const relativePath = relativeDirectory\n ? path.posix.join(relativeDirectory, entry.name)\n : entry.name;\n const absolutePath = path.join(directory, entry.name);\n if (entry.isDirectory()) {\n await visit(absolutePath, relativePath);\n } else {\n assert(\n entry.isFile(),\n `${description} contains a symbolic link or unsupported entry: ${relativePath}`,\n );\n files.push(relativePath);\n }\n }\n }\n\n await visit(rootDirectory, '');\n return files;\n}\n\nfunction md5(contents: Uint8Array | string): string {\n return createHash('md5').update(contents).digest('hex');\n}\n\nfunction percentEncode(contents: Uint8Array): string {\n return [...contents]\n .map((byte) => `%${byte.toString(16).padStart(2, '0').toUpperCase()}`)\n .join('');\n}\n\nfunction encodeExtensionDataUrl(extension: EmbeddedExtension, contents: Uint8Array): string {\n const metadata = [extension.mediaType, ...extension.parameters].join(';');\n if (extension.encoding === 'base64') {\n return `data:${metadata};base64,${Buffer.from(contents).toString('base64')}`;\n }\n return `data:${metadata},${percentEncode(contents)}`;\n}\n\nasync function inspectSb3Source(\n sourceDirectory: string,\n validateManagedExtensions: boolean,\n): Promise<InspectedSb3Source> {\n const resolvedSourceDirectory = path.resolve(sourceDirectory);\n await assertDirectory(resolvedSourceDirectory, 'SB3 source');\n const sourceManifest = await readJson(\n path.join(resolvedSourceDirectory, 'sb3-source.json'),\n 'SB3 source manifest',\n );\n validateSourceManifest(sourceManifest);\n const assetEntries = sourceManifest.archiveEntries.filter(\n (entryName) => entryName !== 'project.json',\n );\n const project: unknown = await readJson(\n path.join(resolvedSourceDirectory, sourceManifest.project),\n 'SB3 project source',\n );\n assert(isObject(project), 'project.source.json must contain an object.');\n const blockPalette =\n sourceManifest.blockPalette === undefined\n ? null\n : validateBlockPaletteDocument(\n await readJson(\n path.join(resolvedSourceDirectory, sourceManifest.blockPalette),\n 'Block palette settings',\n ),\n );\n resolveBlockPaletteReferences(project, blockPalette);\n const extensionManifest = await readJson(\n path.join(resolvedSourceDirectory, sourceManifest.embeddedExtensions),\n 'Embedded extension manifest',\n );\n\n const assetsDirectory = path.join(resolvedSourceDirectory, sourceManifest.assetsDirectory);\n const extensionsDirectory = path.join(resolvedSourceDirectory, 'extensions');\n const [assetFiles, extensionFiles] = await Promise.all([\n listRegularFiles(assetsDirectory, 'Assets directory'),\n listRegularFiles(extensionsDirectory, 'Extensions directory'),\n ]);\n assertSameFileSet(assetFiles, assetEntries, 'Asset files');\n const {extensionBundles: bundleConfiguration, extensions} = validateExtensionLayout(\n extensionManifest,\n project,\n extensionFiles,\n validateExtensionSourceMetadata,\n );\n const extensionBundles = validateExtensionBundleConfigurations(bundleConfiguration, extensions);\n\n const assetContents = new Map<string, Uint8Array>();\n await Promise.all(\n assetFiles.map(async (assetPath) => {\n assetContents.set(assetPath, await readFile(path.join(assetsDirectory, assetPath)));\n }),\n );\n const references = collectSourceAssetReferences(project);\n const referencedAssets = new Set<string>();\n for (const {filename, description} of references) {\n if (referencedAssets.has(filename)) continue;\n const contents = assetContents.get(filename);\n assert(contents, `Referenced asset is missing for ${description}: ${filename}`);\n const assetId = filename.slice(0, 32);\n const actualAssetId = md5(contents);\n assert(\n actualAssetId === assetId,\n `Asset content hash mismatch for ${description}: expected ${assetId}, got ${actualAssetId}`,\n );\n referencedAssets.add(filename);\n }\n const unreferencedAssets = assetFiles.filter((assetPath) => !referencedAssets.has(assetPath));\n assert(\n unreferencedAssets.length === 0,\n `Asset manifest contains unreferenced files: ${unreferencedAssets.join(', ')}`,\n );\n\n const extensionContents = new Map<string, Uint8Array>();\n const extensionApiManifestContents = new Map<string, Uint8Array>();\n await Promise.all(\n extensions.map(async (extension) => {\n const contents = await readFile(path.join(resolvedSourceDirectory, extension.path));\n if (validateManagedExtensions) {\n validateManagedExtensionContents(extension, contents);\n }\n extensionContents.set(extension.id, contents);\n if (extension.source?.apiManifest) {\n const apiManifestContents = await readFile(\n path.join(resolvedSourceDirectory, extension.source.apiManifest.path),\n );\n if (validateManagedExtensions) {\n validateManagedExtensionApiManifest(extension, apiManifestContents);\n }\n extensionApiManifestContents.set(extension.id, apiManifestContents);\n }\n }),\n );\n\n return {\n assetContents,\n assetReferenceCount: references.length,\n blockPalette,\n extensions,\n extensionApiManifestContents,\n extensionBundles,\n extensionContents,\n project,\n resolvedSourceDirectory,\n sourceManifest,\n };\n}\n\nexport async function inspectSb3SourceForExtensionSync(\n sourceDirectory: string,\n): Promise<InspectedSb3Source> {\n return inspectSb3Source(sourceDirectory, false);\n}\n\nexport async function validateSb3Source(sourceDirectory: string): Promise<InspectedSb3Source> {\n const source = await inspectSb3Source(sourceDirectory, true);\n await buildExtensionBundlesWithModules({\n sourceDirectory: source.resolvedSourceDirectory,\n extensionBundles: source.extensionBundles,\n extensionContents: source.extensionContents,\n extensions: source.extensions,\n project: source.project,\n });\n return source;\n}\n\nexport async function createDeterministicSb3(\n sourceDirectory: string,\n options: DeterministicSb3Options = {},\n): Promise<DeterministicSb3> {\n const {allowedAssetRoots = [], cleanUpBlocks = false, projectAssetsPath} = options;\n assert(typeof cleanUpBlocks === 'boolean', 'cleanUpBlocks must be a boolean.');\n assert(Array.isArray(allowedAssetRoots), 'allowedAssetRoots must be an array.');\n assert(\n projectAssetsPath === undefined || typeof projectAssetsPath === 'string',\n 'projectAssetsPath must be a string when provided.',\n );\n const source = await inspectSb3Source(sourceDirectory, true);\n const projectAssets: {\n archiveEntries: string[];\n assetContents: Map<string, Uint8Array>;\n assetReferenceCount: number;\n project: ProjectJson;\n summary: Readonly<ProjectAssetAdditionsSummary> | null;\n } = projectAssetsPath\n ? await applyProjectAssetAdditions({\n allowedAssetRoots,\n assetContents: source.assetContents,\n archiveEntries: source.sourceManifest.archiveEntries,\n manifestPath: projectAssetsPath,\n project: source.project,\n })\n : {\n archiveEntries: source.sourceManifest.archiveEntries,\n assetContents: source.assetContents,\n assetReferenceCount: 0,\n project: source.project,\n summary: null,\n };\n const bundled = await buildExtensionBundlesWithModules({\n sourceDirectory: source.resolvedSourceDirectory,\n extensionBundles: source.extensionBundles,\n extensionContents: source.extensionContents,\n extensions: source.extensions,\n project: projectAssets.project,\n });\n let project = structuredClone(bundled.project);\n let blockCleanUp: BlockCleanUpSummary | null = null;\n if (cleanUpBlocks) {\n const cleaned = cleanUpTurboWarpBlocks(project);\n project = cleaned.project;\n blockCleanUp = {\n movedCommentCount: cleaned.movedCommentCount,\n movedScriptCount: cleaned.movedScriptCount,\n scriptCount: cleaned.scriptCount,\n targetCount: cleaned.targetCount,\n };\n }\n applyBlockPaletteComments(project, source.blockPalette);\n const extensionUrls: Record<string, unknown> = project.extensionURLs ?? {};\n for (const extension of bundled.extensions) {\n const contents = bundled.extensionContents.get(extension.id);\n assert(contents, `Embedded extension has no contents: ${extension.id}`);\n extensionUrls[extension.id] = encodeExtensionDataUrl(extension, contents);\n }\n project.extensionURLs = extensionUrls;\n\n const archiveEntries: Record<string, Uint8Array> = {};\n for (const entryName of projectAssets.archiveEntries) {\n if (entryName === 'project.json') {\n archiveEntries[entryName] = strToU8(`${JSON.stringify(project)}\\n`);\n continue;\n }\n const contents = projectAssets.assetContents.get(entryName);\n assert(contents, `Archive entry has no contents: ${entryName}`);\n archiveEntries[entryName] = contents;\n }\n const archive = zipSync(archiveEntries, {\n level: 6,\n mtime: fixedZipTimestamp,\n });\n\n return {\n archive,\n assetCount: projectAssets.assetContents.size,\n assetReferenceCount: source.assetReferenceCount + projectAssets.assetReferenceCount,\n blockCleanUp,\n bundlePlans: bundled.bundlePlans,\n embeddedExtensionCount: bundled.extensions.length,\n entryCount: projectAssets.archiveEntries.length,\n projectAssetAdditions: projectAssets.summary,\n source,\n };\n}\n"],"mappings":"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"}
package/dist/types.d.ts CHANGED
@@ -74,6 +74,8 @@ export interface Sb3SourceManifest {
74
74
  embeddedExtensions: string;
75
75
  assetsDirectory: string;
76
76
  archiveEntries: string[];
77
+ /** Present only in source format 2. */
78
+ blockPalette?: string;
77
79
  }
78
80
  /**
79
81
  * `project.json` is treated as an opaque record whose known members are narrowed on demand.
package/docs/index.html CHANGED
@@ -69,7 +69,7 @@
69
69
  <body>
70
70
  <header>
71
71
  <h1>SB3 Toolchain</h1>
72
- <p><code>@kubohiroya/sb3-toolchain@0.24.0</code></p>
72
+ <p><code>@kubohiroya/sb3-toolchain@0.25.0</code></p>
73
73
  <nav aria-label="Documentation">
74
74
  <a href="#scope">責務</a><a href="#usage">使い方</a><a href="#api">API</a
75
75
  ><a href="#schemas">Schema</a><a href="#guides">関連文書</a>
@@ -90,7 +90,7 @@
90
90
  <section id="usage">
91
91
  <h2>使い方</h2>
92
92
  <p>公開済みの完全固定versionを使います。</p>
93
- <pre><code>npm install --save-exact @kubohiroya/sb3-toolchain@0.24.0</code></pre>
93
+ <pre><code>npm install --save-exact @kubohiroya/sb3-toolchain@0.25.0</code></pre>
94
94
  <pre><code>sb3-toolchain import tmp/project.sb3 --output app
95
95
  sb3-toolchain check app
96
96
  sb3-toolchain build app --output dist/project.sb3</code></pre>
@@ -157,9 +157,11 @@ sb3-toolchain build app --output dist/project.sb3</code></pre>
157
157
  <li><a href="ja/extension-id-migration.md">ja/extension-id-migration.md</a></li>
158
158
  <li><a href="ja/project-asset-additions.md">ja/project-asset-additions.md</a></li>
159
159
  <li><a href="ja/source-format-v1.md">ja/source-format-v1.md</a></li>
160
+ <li><a href="ja/source-format-v2.md">ja/source-format-v2.md</a></li>
160
161
  <li><a href="ja/workflows.md">ja/workflows.md</a></li>
161
162
  <li><a href="project-asset-additions.md">project-asset-additions.md</a></li>
162
163
  <li><a href="source-format-v1.md">source-format-v1.md</a></li>
164
+ <li><a href="source-format-v2.md">source-format-v2.md</a></li>
163
165
  <li><a href="workflows.md">workflows.md</a></li>
164
166
  <li>
165
167
  <a href="https://github.com/kubohiroya/sb3-toolchain/blob/main/README.md"
@@ -2,6 +2,8 @@
2
2
 
3
3
  [English](../source-format-v1.md)
4
4
 
5
+ ブロックパレットの設定がある作品は、この構成に `block-palette.json` を足した[形式 v2](source-format-v2.md) を使う。設定のない作品は v1 のままである。
6
+
5
7
  ## レイアウト
6
8
 
7
9
  ```text