@kubohiroya/sb3-toolchain 0.1.0 → 0.2.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/src/source.js CHANGED
@@ -7,6 +7,7 @@ import path from 'node:path';
7
7
  import {strToU8, zipSync} from 'fflate';
8
8
 
9
9
  import {validateArchiveEntryName} from './archive.js';
10
+ import {buildExtensionBundles, validateExtensionBundleConfigurations} from './extension-bundle.js';
10
11
  import {
11
12
  validateExtensionSourceMetadata,
12
13
  validateManagedExtensionContents,
@@ -209,7 +210,13 @@ function validateExtensionManifest(extensionManifest, project, extensionFiles) {
209
210
  }
210
211
 
211
212
  assertSameFileSet(extensionFiles, expectedFiles, 'Embedded extension files');
212
- return extensionManifest.extensions;
213
+ return {
214
+ extensionBundles: validateExtensionBundleConfigurations(
215
+ extensionManifest.extensionBundles,
216
+ extensionManifest.extensions,
217
+ ),
218
+ extensions: extensionManifest.extensions,
219
+ };
213
220
  }
214
221
 
215
222
  function collectAssetReferences(project) {
@@ -283,7 +290,11 @@ async function inspectSb3Source(sourceDirectory, validateManagedExtensions) {
283
290
  listRegularFiles(extensionsDirectory, 'Extensions directory'),
284
291
  ]);
285
292
  assertSameFileSet(assetFiles, assetEntries, 'Asset files');
286
- const extensions = validateExtensionManifest(extensionManifest, project, extensionFiles);
293
+ const {extensionBundles, extensions} = validateExtensionManifest(
294
+ extensionManifest,
295
+ project,
296
+ extensionFiles,
297
+ );
287
298
 
288
299
  const assetContents = new Map();
289
300
  await Promise.all(
@@ -337,6 +348,7 @@ async function inspectSb3Source(sourceDirectory, validateManagedExtensions) {
337
348
  assetContents,
338
349
  assetReferenceCount: references.length,
339
350
  extensions,
351
+ extensionBundles,
340
352
  extensionContents,
341
353
  project,
342
354
  resolvedSourceDirectory,
@@ -349,16 +361,29 @@ export async function inspectSb3SourceForExtensionSync(sourceDirectory) {
349
361
  }
350
362
 
351
363
  export async function validateSb3Source(sourceDirectory) {
352
- return inspectSb3Source(sourceDirectory, true);
364
+ const source = await inspectSb3Source(sourceDirectory, true);
365
+ buildExtensionBundles({
366
+ extensionBundles: source.extensionBundles,
367
+ extensionContents: source.extensionContents,
368
+ extensions: source.extensions,
369
+ project: source.project,
370
+ });
371
+ return source;
353
372
  }
354
373
 
355
374
  export async function createDeterministicSb3(sourceDirectory) {
356
375
  const source = await validateSb3Source(sourceDirectory);
357
- const project = structuredClone(source.project);
358
- for (const extension of source.extensions) {
376
+ const bundled = buildExtensionBundles({
377
+ extensionBundles: source.extensionBundles,
378
+ extensionContents: source.extensionContents,
379
+ extensions: source.extensions,
380
+ project: source.project,
381
+ });
382
+ const project = structuredClone(bundled.project);
383
+ for (const extension of bundled.extensions) {
359
384
  project.extensionURLs[extension.id] = encodeExtensionDataUrl(
360
385
  extension,
361
- source.extensionContents.get(extension.id),
386
+ bundled.extensionContents.get(extension.id),
362
387
  );
363
388
  }
364
389
 
@@ -379,7 +404,8 @@ export async function createDeterministicSb3(sourceDirectory) {
379
404
  archive,
380
405
  assetCount: source.assetContents.size,
381
406
  assetReferenceCount: source.assetReferenceCount,
382
- embeddedExtensionCount: source.extensions.length,
407
+ bundlePlans: bundled.bundlePlans,
408
+ embeddedExtensionCount: bundled.extensions.length,
383
409
  entryCount: source.sourceManifest.archiveEntries.length,
384
410
  source,
385
411
  };