@sanity/cli 6.0.0-alpha.9 → 6.0.0

package/dist/actions/media/importMedia.js

@@ -8,13 +8,12 @@ import { pipeline } from 'node:stream/promises';
 import { styleText } from 'node:util';
 import gunzipMaybe from 'gunzip-maybe';
 // @ts-expect-error `peek-stream` module currently untyped
-import isTar from 'is-tar';
-// @ts-expect-error `peek-stream` module currently untyped
 import peek from 'peek-stream';
 import { catchError, EMPTY, filter, from, map, mergeMap, mergeWith, of, switchMap, tap, zip } from 'rxjs';
 import tar from 'tar-fs';
 import { glob } from 'tinyglobby';
-import { findNdjsonEntry } from '../../util/findNdjsonEntry.js';
+import { isTar } from '../../util/isTar.js';
+import { buildNdjsonIndex } from './buildNdjsonIndex.js';
 import { importMediaDebug } from './importMediaDebug.js';
 const DEFAULT_CONCURRENCY = 6;
 export function importer(options) {
@@ -23,15 +22,20 @@ export function importer(options) {
         if (fileCount === 0) {
             throw new Error('No assets to import');
         }
-        const context = {
-            ...options,
-            ndjson: ()=>createReadStream(aspectsNdjsonPath),
-            workingPath
-        };
-        return from(files).pipe(switchMap((file)=>zip(of('file'), of(file))), mergeWith(from(images).pipe(switchMap((file)=>zip(of('image'), of(file))))), fetchExistingAssets(context), uploadAsset(context), resolveAspectData(context), setAspects(context), map((asset)=>({
-                asset,
-                fileCount
-            })));
+        // Stream the ndjson file once and build an index to avoid creating
+        // multiple read streams (which causes file descriptor leaks)
+        const aspectsIndexPromise = buildNdjsonIndex(createReadStream(aspectsNdjsonPath), 'filename', 'aspects');
+        return from(aspectsIndexPromise).pipe(mergeMap((aspectsIndex)=>{
+            const context = {
+                ...options,
+                aspectsIndex,
+                workingPath
+            };
+            return from(files).pipe(switchMap((file)=>zip(of('file'), of(file))), mergeWith(from(images).pipe(switchMap((file)=>zip(of('image'), of(file))))), fetchExistingAssets(context), uploadAsset(context), resolveAspectData(context), setAspects(context), map((asset)=>({
+                    asset,
+                    fileCount
+                })));
+        }));
     }));
 }
 /**
@@ -141,14 +145,14 @@ function fetchExistingAssets({ client, workingPath }) {
     });
 }
 /**
- * Find the first matching entry in the provided NDJSON stream and attach it to the asset object.
+ * Find the first matching entry in the cached aspect data and attach it to the asset object.
  *
  * @internal
- */ function resolveAspectData({ ndjson }) {
-    return mergeMap((resolvedAsset)=>from(findNdjsonEntry(ndjson(), (line)=>typeof line === 'object' && line !== null && 'filename' in line && line.filename === resolvedAsset.originalFilename)).pipe(map((aspectsFromImport)=>({
-                ...resolvedAsset,
-                aspects: aspectsFromImport?.aspects
-            }))));
+ */ function resolveAspectData({ aspectsIndex }) {
+    return map((resolvedAsset)=>({
+            ...resolvedAsset,
+            aspects: aspectsIndex.get(resolvedAsset.originalFilename)
+        }));
 }
 // TODO: Batch mutations to reduce HTTP request count.
 export function setAspects({ client, replaceAspects }) {

package/dist/actions/media/importMedia.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/media/importMedia.ts"],"sourcesContent":["import {createHash} from 'node:crypto'\nimport {createReadStream, type ReadStream} from 'node:fs'\nimport fs, {mkdtemp} from 'node:fs/promises'\nimport {tmpdir} from 'node:os'\nimport path from 'node:path'\nimport {text} from 'node:stream/consumers'\nimport {pipeline} from 'node:stream/promises'\nimport {styleText} from 'node:util'\n\nimport {spinner} from '@sanity/cli-core/ux'\nimport {type SanityClient} from '@sanity/client'\nimport {type FileAsset, type ImageAsset, type SanityDocument} from '@sanity/types'\nimport gunzipMaybe from 'gunzip-maybe'\n// @ts-expect-error `peek-stream` module currently untyped\nimport isTar from 'is-tar'\n// @ts-expect-error `peek-stream` module currently untyped\nimport peek from 'peek-stream'\nimport {\n  catchError,\n  EMPTY,\n  filter,\n  from,\n  map,\n  mergeMap,\n  mergeWith,\n  type Observable,\n  of,\n  type OperatorFunction,\n  switchMap,\n  tap,\n  zip,\n} from 'rxjs'\nimport tar from 'tar-fs'\nimport {glob} from 'tinyglobby'\n\nimport {findNdjsonEntry} from '../../util/findNdjsonEntry.js'\nimport {importMediaDebug} from './importMediaDebug.js'\n\nconst DEFAULT_CONCURRENCY = 6\n\ninterface MediaLibraryUploadResult {\n  asset: SanityDocument & {\n    _type: 'sanity.asset'\n    aspects: unknown\n    assetType: FileAsset['_type'] | ImageAsset['_type']\n  }\n  assetInstance: FileAsset | ImageAsset\n}\n\ninterface MediaLibraryUploadResponse {\n  body: MediaLibraryUploadResult\n  type: 'response'\n}\n\nexport interface State {\n  /**\n   * The last asset processed.\n   */\n  asset: AssetWithAspects\n  /**\n   * The count of input files.\n   */\n  fileCount: number\n}\n\ninterface ResolvedAsset {\n  /**\n   * The ids of the `sanity.asset` documents that currently refer to the asset.\n   *\n   * These documents contain aspects, and reference an asset instance document.\n   */\n  assetIds: string[]\n  isExistingAsset: boolean\n  /**\n   * The original filename of the asset as it appears in the import source.\n   *\n   * Note: Currently includes `images/` or `files/` prefix.\n   */\n  originalFilename: string\n  sha1Hash: string\n}\n\nexport type AssetWithAspects<Asset extends ResolvedAsset = ResolvedAsset> = Asset & {\n  aspects: unknown | undefined\n}\n\ninterface Options {\n  client: SanityClient\n  replaceAspects: boolean\n  sourcePath: string\n  spinner: ReturnType<typeof spinner>\n}\n\ninterface Context extends Options {\n  ndjson: () => ReadStream\n  workingPath: string\n}\n\nexport function importer(options: Options): Observable<State> {\n  return resolveSource(options).pipe(\n    mergeMap(({aspectsNdjsonPath, files, images, workingPath}) => {\n      const fileCount = files.length + images.length\n\n      if (fileCount === 0) {\n        throw new Error('No assets to import')\n      }\n\n      const context: Context = {\n        ...options,\n        ndjson: () => createReadStream(aspectsNdjsonPath),\n        workingPath,\n      }\n\n      return from(files).pipe(\n        switchMap((file) => zip(of<'file'>('file'), of(file))),\n        mergeWith(from(images).pipe(switchMap((file) => zip(of<'image'>('image'), of(file))))),\n        fetchExistingAssets(context),\n        uploadAsset(context),\n        resolveAspectData(context),\n        setAspects(context),\n        map((asset) => ({\n          asset,\n          fileCount,\n        })),\n      )\n    }),\n  )\n}\n\n/**\n * @internal\n */\nexport function resolveSource({sourcePath}: Pick<Context, 'sourcePath'>): Observable<{\n  aspectsNdjsonPath: string\n  files: string[]\n  images: string[]\n  workingPath: string\n}> {\n  return from(fs.stat(sourcePath)).pipe(\n    switchMap((stats) => {\n      return stats.isDirectory()\n        ? of(sourcePath)\n        : from(mkdtemp(path.join(tmpdir(), 'sanity-media-library-import'))).pipe(\n            switchMap((tempPath) => {\n              return from(\n                pipeline(createReadStream(sourcePath), gunzipMaybe(), untarMaybe(tempPath)),\n              ).pipe(map(() => tempPath))\n            }),\n          )\n    }),\n    switchMap((importSourcePath) => {\n      return from(\n        glob(['**/data.ndjson'], {\n          absolute: true,\n          cwd: importSourcePath,\n          deep: 2,\n        }),\n      ).pipe(\n        map(([aspectsNdjsonPath]) => ({\n          aspectsNdjsonPath,\n          importSourcePath,\n          workingPath:\n            aspectsNdjsonPath === undefined ? importSourcePath : path.dirname(aspectsNdjsonPath),\n        })),\n      )\n    }),\n    tap(({aspectsNdjsonPath, importSourcePath}) => {\n      if (aspectsNdjsonPath === undefined) {\n        throw new Error(\n          `No ${styleText('bold', 'data.ndjson')} file found in import source ${styleText('bold', importSourcePath)}`,\n        )\n      }\n      importMediaDebug(`[Found NDJSON file] ${aspectsNdjsonPath}`)\n    }),\n    switchMap(({aspectsNdjsonPath, workingPath}) => {\n      return from(\n        Promise.all([\n          glob(['files/*'], {\n            cwd: workingPath,\n          }),\n          glob(['images/*'], {\n            cwd: workingPath,\n          }),\n        ]),\n      ).pipe(\n        map(([files, images]) => ({\n          aspectsNdjsonPath,\n          files,\n          images,\n          workingPath,\n        })),\n      )\n    }),\n  )\n}\n\n/**\n * Untar the stream if its contents appear to be tarred.\n *\n * @internal\n */\nfunction untarMaybe(outputPath: string) {\n  // @ts-expect-error `peek-stream` module currently untyped\n  return peek({maxBuffer: 300, newline: false}, (data, swap) => {\n    if (isTar(data)) {\n      return swap(null, tar.extract(outputPath))\n    }\n\n    return swap(null)\n  })\n}\n\n/**\n * Fetch the ids of all asset documents that reference the input asset.\n * The input asset is identified by its SHA-1 hash.\n *\n * @internal\n */\nfunction fetchAssetsByHash({\n  client,\n  type,\n}: {\n  client: SanityClient\n  type: 'file' | 'image'\n}): OperatorFunction<string, [hash: string, assetIds: string[]]> {\n  return switchMap((hash) =>\n    client.observable\n      .fetch<string[]>(\n        `*[\n          _type == \"sanity.asset\" &&\n          currentVersion._ref == *[\n            _type == $type &&\n            sha1hash == $hash\n          ][0]._id\n        ]._id`,\n        {\n          hash,\n          type: ['sanity', `${type}Asset`].join('.'),\n        },\n        {\n          tag: 'asset.getId',\n        },\n      )\n      .pipe(switchMap((assetIds) => zip(of(hash), of(assetIds)))),\n  )\n}\n\nfunction fetchExistingAssets({\n  client,\n  workingPath,\n}: Context): OperatorFunction<\n  [type: 'file' | 'image', asset: string],\n  [type: 'file' | 'image', asset: string, hash: string] | ResolvedAsset\n> {\n  return mergeMap(([type, asset]) => {\n    const createSha1Hash = createHash('sha1')\n\n    const sha1hash = text(\n      createReadStream(path.join(workingPath, asset)).pipe(createSha1Hash).setEncoding('hex'),\n    )\n\n    return from(sha1hash).pipe(\n      tap((hash) =>\n        importMediaDebug(`[Asset ${asset}] Checking for ${type} asset with hash ${hash}`),\n      ),\n      fetchAssetsByHash({client, type}),\n      map<\n        [string, string[]],\n        [type: 'file' | 'image', asset: string, hash: string] | ResolvedAsset\n      >(([hash, assetIds]) => {\n        if (assetIds.length === 0) {\n          return [type, asset, hash]\n        }\n\n        return {\n          assetIds,\n          isExistingAsset: true,\n          originalFilename: asset,\n          sha1Hash: hash,\n        }\n      }),\n    )\n  })\n}\n\n/**\n * Find the first matching entry in the provided NDJSON stream and attach it to the asset object.\n *\n * @internal\n */\nfunction resolveAspectData({ndjson}: Context): OperatorFunction<ResolvedAsset, AssetWithAspects> {\n  return mergeMap((resolvedAsset) =>\n    from(\n      findNdjsonEntry<{aspects: unknown}>(\n        ndjson(),\n        (line) =>\n          typeof line === 'object' &&\n          line !== null &&\n          'filename' in line &&\n          line.filename === resolvedAsset.originalFilename,\n      ),\n    ).pipe(\n      map((aspectsFromImport) => ({\n        ...resolvedAsset,\n        aspects: aspectsFromImport?.aspects,\n      })),\n    ),\n  )\n}\n\n// TODO: Batch mutations to reduce HTTP request count.\nexport function setAspects({\n  client,\n  replaceAspects,\n}: Pick<Context, 'client' | 'replaceAspects'>): OperatorFunction<\n  AssetWithAspects,\n  AssetWithAspects\n> {\n  return mergeMap((asset) => {\n    const {aspects, assetIds, isExistingAsset} = asset\n\n    if (isExistingAsset && !replaceAspects) {\n      importMediaDebug(`[Asset ${asset.originalFilename}] Skipping replacement of existing aspects`)\n      return of(asset)\n    }\n\n    if (aspects === undefined) {\n      importMediaDebug(`[Asset ${asset.originalFilename}] No aspects to import`)\n      return of(asset)\n    }\n\n    const transaction = client.observable.transaction()\n    for (const assetId of assetIds) {\n      transaction.patch(assetId, {set: {aspects}})\n    }\n\n    importMediaDebug(\n      `[Asset ${asset.originalFilename}] Setting aspects on asset documents ${JSON.stringify(assetIds)}`,\n    )\n\n    return transaction\n      .commit({\n        tag: 'asset.setAspects',\n        visibility: 'async',\n      })\n      .pipe(map(() => asset))\n  }, DEFAULT_CONCURRENCY)\n}\n\nfunction uploadAsset({\n  client,\n  workingPath,\n}: Context): OperatorFunction<\n  [type: 'file' | 'image', asset: string, hash: string] | ResolvedAsset,\n  ResolvedAsset\n> {\n  return mergeMap((maybeResolvedAsset) => {\n    if ('assetIds' in maybeResolvedAsset) {\n      importMediaDebug(\n        `[Asset ${maybeResolvedAsset.originalFilename}] Skipping upload of existing asset with hash ${maybeResolvedAsset.sha1Hash}`,\n      )\n      return of(maybeResolvedAsset)\n    }\n\n    const [type, asset, hash] = maybeResolvedAsset\n    importMediaDebug(`[Asset ${asset}] Uploading new asset`)\n\n    return client.observable.assets\n      .upload(type, createReadStream(path.join(workingPath, asset)), {\n        tag: 'asset.upload',\n      })\n      .pipe(\n        catchError((error) => {\n          // An asset matching the hash was not found during previous steps, but appears to exist upon upload.\n          //\n          // This may occur if:\n          //   - The asset was uploaded by another client since the check was performed.\n          //   - The asset instance document exists, but is not referenced by any asset document.\n          if (error.statusCode === 409) {\n            importMediaDebug(\n              `[Asset ${asset}] Cannot overwrite existing ${type} asset with hash ${hash}`,\n            )\n            return EMPTY\n          }\n          return EMPTY\n        }),\n        filter((response) => response.type === 'response'),\n        tap(() => importMediaDebug(`[Asset ${asset}] Finished uploading new asset`)),\n        // TODO: The `client.assets.upload` method should return `MediaLibraryUploadResponse` when operating on Media Library resources. When that occurs, this type assertion can be removed.\n        map((response) => (response as unknown as MediaLibraryUploadResponse).body),\n        map<MediaLibraryUploadResult, ResolvedAsset>((result) => ({\n          assetIds: [result.asset._id],\n          isExistingAsset: false,\n          originalFilename: asset,\n          sha1Hash: hash,\n        })),\n      )\n  }, DEFAULT_CONCURRENCY)\n}\n"],"names":["createHash","createReadStream","fs","mkdtemp","tmpdir","path","text","pipeline","styleText","gunzipMaybe","isTar","peek","catchError","EMPTY","filter","from","map","mergeMap","mergeWith","of","switchMap","tap","zip","tar","glob","findNdjsonEntry","importMediaDebug","DEFAULT_CONCURRENCY","importer","options","resolveSource","pipe","aspectsNdjsonPath","files","images","workingPath","fileCount","length","Error","context","ndjson","file","fetchExistingAssets","uploadAsset","resolveAspectData","setAspects","asset","sourcePath","stat","stats","isDirectory","join","tempPath","untarMaybe","importSourcePath","absolute","cwd","deep","undefined","dirname","Promise","all","outputPath","maxBuffer","newline","data","swap","extract","fetchAssetsByHash","client","type","hash","observable","fetch","tag","assetIds","createSha1Hash","sha1hash","setEncoding","isExistingAsset","originalFilename","sha1Hash","resolvedAsset","line","filename","aspectsFromImport","aspects","replaceAspects","transaction","assetId","patch","set","JSON","stringify","commit","visibility","maybeResolvedAsset","assets","upload","error","statusCode","response","body","result","_id"],"mappings":"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"}
+{"version":3,"sources":["../../../src/actions/media/importMedia.ts"],"sourcesContent":["import {createHash} from 'node:crypto'\nimport {createReadStream} from 'node:fs'\nimport fs, {mkdtemp} from 'node:fs/promises'\nimport {tmpdir} from 'node:os'\nimport path from 'node:path'\nimport {text} from 'node:stream/consumers'\nimport {pipeline} from 'node:stream/promises'\nimport {styleText} from 'node:util'\n\nimport {spinner} from '@sanity/cli-core/ux'\nimport {type SanityClient} from '@sanity/client'\nimport {type FileAsset, type ImageAsset, type SanityDocument} from '@sanity/types'\nimport gunzipMaybe from 'gunzip-maybe'\n// @ts-expect-error `peek-stream` module currently untyped\nimport peek from 'peek-stream'\nimport {\n  catchError,\n  EMPTY,\n  filter,\n  from,\n  map,\n  mergeMap,\n  mergeWith,\n  type Observable,\n  of,\n  type OperatorFunction,\n  switchMap,\n  tap,\n  zip,\n} from 'rxjs'\nimport tar from 'tar-fs'\nimport {glob} from 'tinyglobby'\n\nimport {isTar} from '../../util/isTar.js'\nimport {buildNdjsonIndex} from './buildNdjsonIndex.js'\nimport {importMediaDebug} from './importMediaDebug.js'\n\nconst DEFAULT_CONCURRENCY = 6\n\ninterface MediaLibraryUploadResult {\n  asset: SanityDocument & {\n    _type: 'sanity.asset'\n    aspects: unknown\n    assetType: FileAsset['_type'] | ImageAsset['_type']\n  }\n  assetInstance: FileAsset | ImageAsset\n}\n\ninterface MediaLibraryUploadResponse {\n  body: MediaLibraryUploadResult\n  type: 'response'\n}\n\nexport interface State {\n  /**\n   * The last asset processed.\n   */\n  asset: AssetWithAspects\n  /**\n   * The count of input files.\n   */\n  fileCount: number\n}\n\ninterface ResolvedAsset {\n  /**\n   * The ids of the `sanity.asset` documents that currently refer to the asset.\n   *\n   * These documents contain aspects, and reference an asset instance document.\n   */\n  assetIds: string[]\n  isExistingAsset: boolean\n  /**\n   * The original filename of the asset as it appears in the import source.\n   *\n   * Note: Currently includes `images/` or `files/` prefix.\n   */\n  originalFilename: string\n  sha1Hash: string\n}\n\nexport type AssetWithAspects<Asset extends ResolvedAsset = ResolvedAsset> = Asset & {\n  aspects: unknown | undefined\n}\n\ninterface Options {\n  client: SanityClient\n  replaceAspects: boolean\n  sourcePath: string\n  spinner: ReturnType<typeof spinner>\n}\n\ninterface Context extends Options {\n  aspectsIndex: Map<string, unknown>\n  workingPath: string\n}\n\nexport function importer(options: Options): Observable<State> {\n  return resolveSource(options).pipe(\n    mergeMap(({aspectsNdjsonPath, files, images, workingPath}) => {\n      const fileCount = files.length + images.length\n\n      if (fileCount === 0) {\n        throw new Error('No assets to import')\n      }\n\n      // Stream the ndjson file once and build an index to avoid creating\n      // multiple read streams (which causes file descriptor leaks)\n      const aspectsIndexPromise = buildNdjsonIndex(\n        createReadStream(aspectsNdjsonPath),\n        'filename',\n        'aspects',\n      )\n\n      return from(aspectsIndexPromise).pipe(\n        mergeMap((aspectsIndex) => {\n          const context: Context = {\n            ...options,\n            aspectsIndex,\n            workingPath,\n          }\n\n          return from(files).pipe(\n            switchMap((file) => zip(of<'file'>('file'), of(file))),\n            mergeWith(from(images).pipe(switchMap((file) => zip(of<'image'>('image'), of(file))))),\n            fetchExistingAssets(context),\n            uploadAsset(context),\n            resolveAspectData(context),\n            setAspects(context),\n            map((asset) => ({\n              asset,\n              fileCount,\n            })),\n          )\n        }),\n      )\n    }),\n  )\n}\n\n/**\n * @internal\n */\nexport function resolveSource({sourcePath}: Pick<Context, 'sourcePath'>): Observable<{\n  aspectsNdjsonPath: string\n  files: string[]\n  images: string[]\n  workingPath: string\n}> {\n  return from(fs.stat(sourcePath)).pipe(\n    switchMap((stats) => {\n      return stats.isDirectory()\n        ? of(sourcePath)\n        : from(mkdtemp(path.join(tmpdir(), 'sanity-media-library-import'))).pipe(\n            switchMap((tempPath) => {\n              return from(\n                pipeline(createReadStream(sourcePath), gunzipMaybe(), untarMaybe(tempPath)),\n              ).pipe(map(() => tempPath))\n            }),\n          )\n    }),\n    switchMap((importSourcePath) => {\n      return from(\n        glob(['**/data.ndjson'], {\n          absolute: true,\n          cwd: importSourcePath,\n          deep: 2,\n        }),\n      ).pipe(\n        map(([aspectsNdjsonPath]) => ({\n          aspectsNdjsonPath,\n          importSourcePath,\n          workingPath:\n            aspectsNdjsonPath === undefined ? importSourcePath : path.dirname(aspectsNdjsonPath),\n        })),\n      )\n    }),\n    tap(({aspectsNdjsonPath, importSourcePath}) => {\n      if (aspectsNdjsonPath === undefined) {\n        throw new Error(\n          `No ${styleText('bold', 'data.ndjson')} file found in import source ${styleText('bold', importSourcePath)}`,\n        )\n      }\n      importMediaDebug(`[Found NDJSON file] ${aspectsNdjsonPath}`)\n    }),\n    switchMap(({aspectsNdjsonPath, workingPath}) => {\n      return from(\n        Promise.all([\n          glob(['files/*'], {\n            cwd: workingPath,\n          }),\n          glob(['images/*'], {\n            cwd: workingPath,\n          }),\n        ]),\n      ).pipe(\n        map(([files, images]) => ({\n          aspectsNdjsonPath,\n          files,\n          images,\n          workingPath,\n        })),\n      )\n    }),\n  )\n}\n\n/**\n * Untar the stream if its contents appear to be tarred.\n *\n * @internal\n */\nfunction untarMaybe(outputPath: string) {\n  // @ts-expect-error `peek-stream` module currently untyped\n  return peek({maxBuffer: 300, newline: false}, (data, swap) => {\n    if (isTar(data)) {\n      return swap(null, tar.extract(outputPath))\n    }\n\n    return swap(null)\n  })\n}\n\n/**\n * Fetch the ids of all asset documents that reference the input asset.\n * The input asset is identified by its SHA-1 hash.\n *\n * @internal\n */\nfunction fetchAssetsByHash({\n  client,\n  type,\n}: {\n  client: SanityClient\n  type: 'file' | 'image'\n}): OperatorFunction<string, [hash: string, assetIds: string[]]> {\n  return switchMap((hash) =>\n    client.observable\n      .fetch<string[]>(\n        `*[\n          _type == \"sanity.asset\" &&\n          currentVersion._ref == *[\n            _type == $type &&\n            sha1hash == $hash\n          ][0]._id\n        ]._id`,\n        {\n          hash,\n          type: ['sanity', `${type}Asset`].join('.'),\n        },\n        {\n          tag: 'asset.getId',\n        },\n      )\n      .pipe(switchMap((assetIds) => zip(of(hash), of(assetIds)))),\n  )\n}\n\nfunction fetchExistingAssets({\n  client,\n  workingPath,\n}: Context): OperatorFunction<\n  [type: 'file' | 'image', asset: string],\n  [type: 'file' | 'image', asset: string, hash: string] | ResolvedAsset\n> {\n  return mergeMap(([type, asset]) => {\n    const createSha1Hash = createHash('sha1')\n\n    const sha1hash = text(\n      createReadStream(path.join(workingPath, asset)).pipe(createSha1Hash).setEncoding('hex'),\n    )\n\n    return from(sha1hash).pipe(\n      tap((hash) =>\n        importMediaDebug(`[Asset ${asset}] Checking for ${type} asset with hash ${hash}`),\n      ),\n      fetchAssetsByHash({client, type}),\n      map<\n        [string, string[]],\n        [type: 'file' | 'image', asset: string, hash: string] | ResolvedAsset\n      >(([hash, assetIds]) => {\n        if (assetIds.length === 0) {\n          return [type, asset, hash]\n        }\n\n        return {\n          assetIds,\n          isExistingAsset: true,\n          originalFilename: asset,\n          sha1Hash: hash,\n        }\n      }),\n    )\n  })\n}\n\n/**\n * Find the first matching entry in the cached aspect data and attach it to the asset object.\n *\n * @internal\n */\nfunction resolveAspectData({\n  aspectsIndex,\n}: Context): OperatorFunction<ResolvedAsset, AssetWithAspects> {\n  return map((resolvedAsset) => ({\n    ...resolvedAsset,\n    aspects: aspectsIndex.get(resolvedAsset.originalFilename),\n  }))\n}\n\n// TODO: Batch mutations to reduce HTTP request count.\nexport function setAspects({\n  client,\n  replaceAspects,\n}: Pick<Context, 'client' | 'replaceAspects'>): OperatorFunction<\n  AssetWithAspects,\n  AssetWithAspects\n> {\n  return mergeMap((asset) => {\n    const {aspects, assetIds, isExistingAsset} = asset\n\n    if (isExistingAsset && !replaceAspects) {\n      importMediaDebug(`[Asset ${asset.originalFilename}] Skipping replacement of existing aspects`)\n      return of(asset)\n    }\n\n    if (aspects === undefined) {\n      importMediaDebug(`[Asset ${asset.originalFilename}] No aspects to import`)\n      return of(asset)\n    }\n\n    const transaction = client.observable.transaction()\n    for (const assetId of assetIds) {\n      transaction.patch(assetId, {set: {aspects}})\n    }\n\n    importMediaDebug(\n      `[Asset ${asset.originalFilename}] Setting aspects on asset documents ${JSON.stringify(assetIds)}`,\n    )\n\n    return transaction\n      .commit({\n        tag: 'asset.setAspects',\n        visibility: 'async',\n      })\n      .pipe(map(() => asset))\n  }, DEFAULT_CONCURRENCY)\n}\n\nfunction uploadAsset({\n  client,\n  workingPath,\n}: Context): OperatorFunction<\n  [type: 'file' | 'image', asset: string, hash: string] | ResolvedAsset,\n  ResolvedAsset\n> {\n  return mergeMap((maybeResolvedAsset) => {\n    if ('assetIds' in maybeResolvedAsset) {\n      importMediaDebug(\n        `[Asset ${maybeResolvedAsset.originalFilename}] Skipping upload of existing asset with hash ${maybeResolvedAsset.sha1Hash}`,\n      )\n      return of(maybeResolvedAsset)\n    }\n\n    const [type, asset, hash] = maybeResolvedAsset\n    importMediaDebug(`[Asset ${asset}] Uploading new asset`)\n\n    return client.observable.assets\n      .upload(type, createReadStream(path.join(workingPath, asset)), {\n        tag: 'asset.upload',\n      })\n      .pipe(\n        catchError((error) => {\n          // An asset matching the hash was not found during previous steps, but appears to exist upon upload.\n          //\n          // This may occur if:\n          //   - The asset was uploaded by another client since the check was performed.\n          //   - The asset instance document exists, but is not referenced by any asset document.\n          if (error.statusCode === 409) {\n            importMediaDebug(\n              `[Asset ${asset}] Cannot overwrite existing ${type} asset with hash ${hash}`,\n            )\n            return EMPTY\n          }\n          return EMPTY\n        }),\n        filter((response) => response.type === 'response'),\n        tap(() => importMediaDebug(`[Asset ${asset}] Finished uploading new asset`)),\n        // TODO: The `client.assets.upload` method should return `MediaLibraryUploadResponse` when operating on Media Library resources. When that occurs, this type assertion can be removed.\n        map((response) => (response as unknown as MediaLibraryUploadResponse).body),\n        map<MediaLibraryUploadResult, ResolvedAsset>((result) => ({\n          assetIds: [result.asset._id],\n          isExistingAsset: false,\n          originalFilename: asset,\n          sha1Hash: hash,\n        })),\n      )\n  }, DEFAULT_CONCURRENCY)\n}\n"],"names":["createHash","createReadStream","fs","mkdtemp","tmpdir","path","text","pipeline","styleText","gunzipMaybe","peek","catchError","EMPTY","filter","from","map","mergeMap","mergeWith","of","switchMap","tap","zip","tar","glob","isTar","buildNdjsonIndex","importMediaDebug","DEFAULT_CONCURRENCY","importer","options","resolveSource","pipe","aspectsNdjsonPath","files","images","workingPath","fileCount","length","Error","aspectsIndexPromise","aspectsIndex","context","file","fetchExistingAssets","uploadAsset","resolveAspectData","setAspects","asset","sourcePath","stat","stats","isDirectory","join","tempPath","untarMaybe","importSourcePath","absolute","cwd","deep","undefined","dirname","Promise","all","outputPath","maxBuffer","newline","data","swap","extract","fetchAssetsByHash","client","type","hash","observable","fetch","tag","assetIds","createSha1Hash","sha1hash","setEncoding","isExistingAsset","originalFilename","sha1Hash","resolvedAsset","aspects","get","replaceAspects","transaction","assetId","patch","set","JSON","stringify","commit","visibility","maybeResolvedAsset","assets","upload","error","statusCode","response","body","result","_id"],"mappings":"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"}

package/dist/actions/organizations/findOrganizationByUserName.js

@@ -0,0 +1,5 @@
+export function findOrganizationByUserName(organizations, user) {
+    return organizations.find((org)=>org.name === user?.name)?.id;
+}
+
+//# sourceMappingURL=findOrganizationByUserName.js.map

package/dist/actions/organizations/findOrganizationByUserName.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/organizations/findOrganizationByUserName.ts"],"sourcesContent":["import {type SanityOrgUser} from '@sanity/cli-core'\n\nimport {type ProjectOrganization} from '../../services/organizations.js'\n\nexport function findOrganizationByUserName(\n  organizations: ProjectOrganization[],\n  user: SanityOrgUser,\n): string | undefined {\n  return organizations.find((org) => org.name === user?.name)?.id\n}\n"],"names":["findOrganizationByUserName","organizations","user","find","org","name","id"],"mappings":"AAIA,OAAO,SAASA,2BACdC,aAAoC,EACpCC,IAAmB;IAEnB,OAAOD,cAAcE,IAAI,CAAC,CAACC,MAAQA,IAAIC,IAAI,KAAKH,MAAMG,OAAOC;AAC/D"}

package/dist/actions/organizations/getOrganization.js

@@ -2,6 +2,7 @@ import { subdebug } from '@sanity/cli-core';
 import { select, spinner } from '@sanity/cli-core/ux';
 import { promptForOrganizationName } from '../../prompts/promptForOrganizationName.js';
 import { createOrganization, listOrganizations } from '../../services/organizations.js';
+import { findOrganizationByUserName } from './findOrganizationByUserName.js';
 import { getOrganizationChoices } from './getOrganizationChoices.js';
 import { getOrganizationsWithAttachGrantInfo } from './getOrganizationsWithAttachGrantInfo.js';
 const debug = subdebug('getOrganizationId');
@@ -43,7 +44,7 @@ export async function getOrganization({ isUnattended, output, requestedId, user
     const withGrantInfo = await getOrganizationsWithAttachGrantInfo(organizations);
     const withAttach = withGrantInfo.filter(({ hasAttachGrant })=>hasAttachGrant);
     debug('User has attach access to %d organizations.', withAttach.length);
-    const organizationChoices = getOrganizationChoices(withAttach);
+    const organizationChoices = getOrganizationChoices(withGrantInfo);
     // In unattended mode  use defaults without prompting
     if (isUnattended) {
         // Use the first organization with attach permissions
@@ -52,7 +53,7 @@ export async function getOrganization({ isUnattended, output, requestedId, user
     // If the user only has a single organization (and they have attach access to it),
     // we'll default to that one. Otherwise, we'll default to the organization with the
     // same name as the user if it exists.
-    const defaultOrganizationId = withAttach.length === 1 ? withAttach[0].organization.id : organizations.find((org)=>org.name === user?.name)?.id;
+    const defaultOrganizationId = withAttach.length === 1 ? withAttach[0].organization.id : findOrganizationByUserName(organizations, user);
     const chosenOrg = await select({
         choices: organizationChoices,
         default: defaultOrganizationId || undefined,

package/dist/actions/organizations/getOrganization.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/organizations/getOrganization.ts"],"sourcesContent":["import {Output, type SanityOrgUser, subdebug} from '@sanity/cli-core'\nimport {select, spinner} from '@sanity/cli-core/ux'\n\nimport {promptForOrganizationName} from '../../prompts/promptForOrganizationName.js'\nimport {\n  createOrganization,\n  listOrganizations,\n  type ProjectOrganization,\n} from '../../services/organizations.js'\nimport {getOrganizationChoices} from './getOrganizationChoices.js'\nimport {getOrganizationsWithAttachGrantInfo} from './getOrganizationsWithAttachGrantInfo.js'\n\nconst debug = subdebug('getOrganizationId')\n\ninterface GetOrganizationOptions {\n  isUnattended: boolean\n  output: Output\n  requestedId: string | undefined\n  user: SanityOrgUser\n}\n\nconst promptAndCreateNewOrganization = async (user: SanityOrgUser) => {\n  const organizationName = await promptForOrganizationName(user)\n  const spin = spinner('Creating organization').start()\n  const newOrganization = await createOrganization(organizationName)\n  spin.succeed()\n  return newOrganization\n}\n\nexport async function getOrganization({\n  isUnattended,\n  output,\n  requestedId,\n  user,\n}: GetOrganizationOptions) {\n  // Get available organizations\n  const spin = spinner('Loading organizations').start()\n  let organizations: ProjectOrganization[]\n  try {\n    organizations = await listOrganizations()\n    spin.succeed()\n  } catch (error) {\n    spin.fail()\n    debug('Error retrieving organization list', error)\n    throw error\n  }\n\n  // If organization is specified, validate it\n  if (requestedId) {\n    const org = organizations.find((o) => o.id === requestedId || o.slug === requestedId)\n    if (org) return org\n\n    throw new Error(`Organization \"${requestedId}\" not found or you don't have access to it`)\n  }\n\n  // If the user has no organizations, prompt them to create one with the same name as\n  // their user, but allow them to customize it if they want\n  if (organizations.length === 0) {\n    output.log('You need to create an organization to create projects.')\n    return promptAndCreateNewOrganization(user)\n  }\n\n  // If the user has organizations, let them choose from them, but also allow them to\n  // create a new one in case they do not have access to any of them, or they want to\n  // create a personal/other organization.\n  debug(`User has ${organizations.length} organization(s), checking attach access`)\n  const withGrantInfo = await getOrganizationsWithAttachGrantInfo(organizations)\n  const withAttach = withGrantInfo.filter(({hasAttachGrant}) => hasAttachGrant)\n\n  debug('User has attach access to %d organizations.', withAttach.length)\n  const organizationChoices = getOrganizationChoices(withAttach)\n\n  // In unattended mode  use defaults without prompting\n  if (isUnattended) {\n    // Use the first organization with attach permissions\n    return withAttach.length > 0 ? withAttach[0].organization : undefined\n  }\n\n  // If the user only has a single organization (and they have attach access to it),\n  // we'll default to that one. Otherwise, we'll default to the organization with the\n  // same name as the user if it exists.\n  const defaultOrganizationId =\n    withAttach.length === 1\n      ? withAttach[0].organization.id\n      : organizations.find((org) => org.name === user?.name)?.id\n\n  const chosenOrg = await select({\n    choices: organizationChoices,\n    default: defaultOrganizationId || undefined,\n    message: 'Select organization:',\n  })\n\n  if (chosenOrg === '-new-') {\n    return promptAndCreateNewOrganization(user)\n  }\n\n  return organizations.find((org) => org.id === chosenOrg)\n}\n"],"names":["subdebug","select","spinner","promptForOrganizationName","createOrganization","listOrganizations","getOrganizationChoices","getOrganizationsWithAttachGrantInfo","debug","promptAndCreateNewOrganization","user","organizationName","spin","start","newOrganization","succeed","getOrganization","isUnattended","output","requestedId","organizations","error","fail","org","find","o","id","slug","Error","length","log","withGrantInfo","withAttach","filter","hasAttachGrant","organizationChoices","organization","undefined","defaultOrganizationId","name","chosenOrg","choices","default","message"],"mappings":"AAAA,SAAoCA,QAAQ,QAAO,mBAAkB;AACrE,SAAQC,MAAM,EAAEC,OAAO,QAAO,sBAAqB;AAEnD,SAAQC,yBAAyB,QAAO,6CAA4C;AACpF,SACEC,kBAAkB,EAClBC,iBAAiB,QAEZ,kCAAiC;AACxC,SAAQC,sBAAsB,QAAO,8BAA6B;AAClE,SAAQC,mCAAmC,QAAO,2CAA0C;AAE5F,MAAMC,QAAQR,SAAS;AASvB,MAAMS,iCAAiC,OAAOC;IAC5C,MAAMC,mBAAmB,MAAMR,0BAA0BO;IACzD,MAAME,OAAOV,QAAQ,yBAAyBW,KAAK;IACnD,MAAMC,kBAAkB,MAAMV,mBAAmBO;IACjDC,KAAKG,OAAO;IACZ,OAAOD;AACT;AAEA,OAAO,eAAeE,gBAAgB,EACpCC,YAAY,EACZC,MAAM,EACNC,WAAW,EACXT,IAAI,EACmB;IACvB,8BAA8B;IAC9B,MAAME,OAAOV,QAAQ,yBAAyBW,KAAK;IACnD,IAAIO;IACJ,IAAI;QACFA,gBAAgB,MAAMf;QACtBO,KAAKG,OAAO;IACd,EAAE,OAAOM,OAAO;QACdT,KAAKU,IAAI;QACTd,MAAM,sCAAsCa;QAC5C,MAAMA;IACR;IAEA,4CAA4C;IAC5C,IAAIF,aAAa;QACf,MAAMI,MAAMH,cAAcI,IAAI,CAAC,CAACC,IAAMA,EAAEC,EAAE,KAAKP,eAAeM,EAAEE,IAAI,KAAKR;QACzE,IAAII,KAAK,OAAOA;QAEhB,MAAM,IAAIK,MAAM,CAAC,cAAc,EAAET,YAAY,0CAA0C,CAAC;IAC1F;IAEA,oFAAoF;IACpF,0DAA0D;IAC1D,IAAIC,cAAcS,MAAM,KAAK,GAAG;QAC9BX,OAAOY,GAAG,CAAC;QACX,OAAOrB,+BAA+BC;IACxC;IAEA,mFAAmF;IACnF,mFAAmF;IACnF,wCAAwC;IACxCF,MAAM,CAAC,SAAS,EAAEY,cAAcS,MAAM,CAAC,wCAAwC,CAAC;IAChF,MAAME,gBAAgB,MAAMxB,oCAAoCa;IAChE,MAAMY,aAAaD,cAAcE,MAAM,CAAC,CAAC,EAACC,cAAc,EAAC,GAAKA;IAE9D1B,MAAM,+CAA+CwB,WAAWH,MAAM;IACtE,MAAMM,sBAAsB7B,uBAAuB0B;IAEnD,qDAAqD;IACrD,IAAIf,cAAc;QAChB,qDAAqD;QACrD,OAAOe,WAAWH,MAAM,GAAG,IAAIG,UAAU,CAAC,EAAE,CAACI,YAAY,GAAGC;IAC9D;IAEA,kFAAkF;IAClF,mFAAmF;IACnF,sCAAsC;IACtC,MAAMC,wBACJN,WAAWH,MAAM,KAAK,IAClBG,UAAU,CAAC,EAAE,CAACI,YAAY,CAACV,EAAE,GAC7BN,cAAcI,IAAI,CAAC,CAACD,MAAQA,IAAIgB,IAAI,KAAK7B,MAAM6B,OAAOb;IAE5D,MAAMc,YAAY,MAAMvC,OAAO;QAC7BwC,SAASN;QACTO,SAASJ,yBAAyBD;QAClCM,SAAS;IACX;IAEA,IAAIH,cAAc,SAAS;QACzB,OAAO/B,+BAA+BC;IACxC;IAEA,OAAOU,cAAcI,IAAI,CAAC,CAACD,MAAQA,IAAIG,EAAE,KAAKc;AAChD"}
+{"version":3,"sources":["../../../src/actions/organizations/getOrganization.ts"],"sourcesContent":["import {Output, type SanityOrgUser, subdebug} from '@sanity/cli-core'\nimport {select, spinner} from '@sanity/cli-core/ux'\n\nimport {promptForOrganizationName} from '../../prompts/promptForOrganizationName.js'\nimport {\n  createOrganization,\n  listOrganizations,\n  type ProjectOrganization,\n} from '../../services/organizations.js'\nimport {findOrganizationByUserName} from './findOrganizationByUserName.js'\nimport {getOrganizationChoices} from './getOrganizationChoices.js'\nimport {getOrganizationsWithAttachGrantInfo} from './getOrganizationsWithAttachGrantInfo.js'\n\nconst debug = subdebug('getOrganizationId')\n\ninterface GetOrganizationOptions {\n  isUnattended: boolean\n  output: Output\n  requestedId: string | undefined\n  user: SanityOrgUser\n}\n\nconst promptAndCreateNewOrganization = async (user: SanityOrgUser) => {\n  const organizationName = await promptForOrganizationName(user)\n  const spin = spinner('Creating organization').start()\n  const newOrganization = await createOrganization(organizationName)\n  spin.succeed()\n  return newOrganization\n}\n\nexport async function getOrganization({\n  isUnattended,\n  output,\n  requestedId,\n  user,\n}: GetOrganizationOptions) {\n  // Get available organizations\n  const spin = spinner('Loading organizations').start()\n  let organizations: ProjectOrganization[]\n  try {\n    organizations = await listOrganizations()\n    spin.succeed()\n  } catch (error) {\n    spin.fail()\n    debug('Error retrieving organization list', error)\n    throw error\n  }\n\n  // If organization is specified, validate it\n  if (requestedId) {\n    const org = organizations.find((o) => o.id === requestedId || o.slug === requestedId)\n    if (org) return org\n\n    throw new Error(`Organization \"${requestedId}\" not found or you don't have access to it`)\n  }\n\n  // If the user has no organizations, prompt them to create one with the same name as\n  // their user, but allow them to customize it if they want\n  if (organizations.length === 0) {\n    output.log('You need to create an organization to create projects.')\n    return promptAndCreateNewOrganization(user)\n  }\n\n  // If the user has organizations, let them choose from them, but also allow them to\n  // create a new one in case they do not have access to any of them, or they want to\n  // create a personal/other organization.\n  debug(`User has ${organizations.length} organization(s), checking attach access`)\n  const withGrantInfo = await getOrganizationsWithAttachGrantInfo(organizations)\n  const withAttach = withGrantInfo.filter(({hasAttachGrant}) => hasAttachGrant)\n\n  debug('User has attach access to %d organizations.', withAttach.length)\n  const organizationChoices = getOrganizationChoices(withGrantInfo)\n\n  // In unattended mode  use defaults without prompting\n  if (isUnattended) {\n    // Use the first organization with attach permissions\n    return withAttach.length > 0 ? withAttach[0].organization : undefined\n  }\n\n  // If the user only has a single organization (and they have attach access to it),\n  // we'll default to that one. Otherwise, we'll default to the organization with the\n  // same name as the user if it exists.\n  const defaultOrganizationId =\n    withAttach.length === 1\n      ? withAttach[0].organization.id\n      : findOrganizationByUserName(organizations, user)\n\n  const chosenOrg = await select({\n    choices: organizationChoices,\n    default: defaultOrganizationId || undefined,\n    message: 'Select organization:',\n  })\n\n  if (chosenOrg === '-new-') {\n    return promptAndCreateNewOrganization(user)\n  }\n\n  return organizations.find((org) => org.id === chosenOrg)\n}\n"],"names":["subdebug","select","spinner","promptForOrganizationName","createOrganization","listOrganizations","findOrganizationByUserName","getOrganizationChoices","getOrganizationsWithAttachGrantInfo","debug","promptAndCreateNewOrganization","user","organizationName","spin","start","newOrganization","succeed","getOrganization","isUnattended","output","requestedId","organizations","error","fail","org","find","o","id","slug","Error","length","log","withGrantInfo","withAttach","filter","hasAttachGrant","organizationChoices","organization","undefined","defaultOrganizationId","chosenOrg","choices","default","message"],"mappings":"AAAA,SAAoCA,QAAQ,QAAO,mBAAkB;AACrE,SAAQC,MAAM,EAAEC,OAAO,QAAO,sBAAqB;AAEnD,SAAQC,yBAAyB,QAAO,6CAA4C;AACpF,SACEC,kBAAkB,EAClBC,iBAAiB,QAEZ,kCAAiC;AACxC,SAAQC,0BAA0B,QAAO,kCAAiC;AAC1E,SAAQC,sBAAsB,QAAO,8BAA6B;AAClE,SAAQC,mCAAmC,QAAO,2CAA0C;AAE5F,MAAMC,QAAQT,SAAS;AASvB,MAAMU,iCAAiC,OAAOC;IAC5C,MAAMC,mBAAmB,MAAMT,0BAA0BQ;IACzD,MAAME,OAAOX,QAAQ,yBAAyBY,KAAK;IACnD,MAAMC,kBAAkB,MAAMX,mBAAmBQ;IACjDC,KAAKG,OAAO;IACZ,OAAOD;AACT;AAEA,OAAO,eAAeE,gBAAgB,EACpCC,YAAY,EACZC,MAAM,EACNC,WAAW,EACXT,IAAI,EACmB;IACvB,8BAA8B;IAC9B,MAAME,OAAOX,QAAQ,yBAAyBY,KAAK;IACnD,IAAIO;IACJ,IAAI;QACFA,gBAAgB,MAAMhB;QACtBQ,KAAKG,OAAO;IACd,EAAE,OAAOM,OAAO;QACdT,KAAKU,IAAI;QACTd,MAAM,sCAAsCa;QAC5C,MAAMA;IACR;IAEA,4CAA4C;IAC5C,IAAIF,aAAa;QACf,MAAMI,MAAMH,cAAcI,IAAI,CAAC,CAACC,IAAMA,EAAEC,EAAE,KAAKP,eAAeM,EAAEE,IAAI,KAAKR;QACzE,IAAII,KAAK,OAAOA;QAEhB,MAAM,IAAIK,MAAM,CAAC,cAAc,EAAET,YAAY,0CAA0C,CAAC;IAC1F;IAEA,oFAAoF;IACpF,0DAA0D;IAC1D,IAAIC,cAAcS,MAAM,KAAK,GAAG;QAC9BX,OAAOY,GAAG,CAAC;QACX,OAAOrB,+BAA+BC;IACxC;IAEA,mFAAmF;IACnF,mFAAmF;IACnF,wCAAwC;IACxCF,MAAM,CAAC,SAAS,EAAEY,cAAcS,MAAM,CAAC,wCAAwC,CAAC;IAChF,MAAME,gBAAgB,MAAMxB,oCAAoCa;IAChE,MAAMY,aAAaD,cAAcE,MAAM,CAAC,CAAC,EAACC,cAAc,EAAC,GAAKA;IAE9D1B,MAAM,+CAA+CwB,WAAWH,MAAM;IACtE,MAAMM,sBAAsB7B,uBAAuByB;IAEnD,qDAAqD;IACrD,IAAId,cAAc;QAChB,qDAAqD;QACrD,OAAOe,WAAWH,MAAM,GAAG,IAAIG,UAAU,CAAC,EAAE,CAACI,YAAY,GAAGC;IAC9D;IAEA,kFAAkF;IAClF,mFAAmF;IACnF,sCAAsC;IACtC,MAAMC,wBACJN,WAAWH,MAAM,KAAK,IAClBG,UAAU,CAAC,EAAE,CAACI,YAAY,CAACV,EAAE,GAC7BrB,2BAA2Be,eAAeV;IAEhD,MAAM6B,YAAY,MAAMvC,OAAO;QAC7BwC,SAASL;QACTM,SAASH,yBAAyBD;QAClCK,SAAS;IACX;IAEA,IAAIH,cAAc,SAAS;QACzB,OAAO9B,+BAA+BC;IACxC;IAEA,OAAOU,cAAcI,IAAI,CAAC,CAACD,MAAQA,IAAIG,EAAE,KAAKa;AAChD"}

package/dist/actions/organizations/getOrganizationChoices.js

@@ -1,23 +1,31 @@
-export function getOrganizationChoices(withGrantInfo) {
-    const choices = withGrantInfo.map(({ hasAttachGrant, organization })=>({
-            disabled: hasAttachGrant ? false : 'Insufficient permissions',
-            name: `${organization.name} [${organization.id}]`,
-            value: organization.id
-        }));
-    choices.push({
-        disabled: true,
-        name: '─────────',
-        value: '---separator---'
-    }, {
-        disabled: false,
-        name: 'Create new organization',
-        value: '-new-'
-    }, {
-        disabled: true,
-        name: '─────────',
-        value: '---separator2---'
+import { Separator } from '@sanity/cli-core/ux';
+function isOrganizationWithGrant(org) {
+    return 'hasAttachGrant' in org;
+}
+export function getOrganizationChoices(organizations) {
+    const choices = organizations.map((org)=>{
+        if (isOrganizationWithGrant(org)) {
+            return {
+                disabled: org.hasAttachGrant ? false : 'Insufficient permissions',
+                name: `${org.organization.name} [${org.organization.id}]`,
+                value: org.organization.id
+            };
+        }
+        return {
+            name: `${org.name} [${org.id}]`,
+            value: org.id
+        };
     });
-    return choices;
+    return [
+        {
+            name: 'Create new organization',
+            value: '-new-'
+        },
+        ...choices.length > 0 ? [
+            new Separator(),
+            ...choices
+        ] : []
+    ];
 }
 
 //# sourceMappingURL=getOrganizationChoices.js.map

package/dist/actions/organizations/getOrganizationChoices.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/organizations/getOrganizationChoices.ts"],"sourcesContent":["import {type OrganizationWithGrant} from '../../services/organizations.js'\n\nexport function getOrganizationChoices(withGrantInfo: OrganizationWithGrant[]): Array<{\n  disabled: boolean | string\n  name: string\n  value: string\n}> {\n  const choices = withGrantInfo.map(({hasAttachGrant, organization}) => ({\n    disabled: hasAttachGrant ? false : 'Insufficient permissions',\n    name: `${organization.name} [${organization.id}]`,\n    value: organization.id,\n  }))\n\n  choices.push(\n    {disabled: true, name: '─────────', value: '---separator---'},\n    {disabled: false, name: 'Create new organization', value: '-new-'},\n    {disabled: true, name: '─────────', value: '---separator2---'},\n  )\n\n  return choices\n}\n"],"names":["getOrganizationChoices","withGrantInfo","choices","map","hasAttachGrant","organization","disabled","name","id","value","push"],"mappings":"AAEA,OAAO,SAASA,uBAAuBC,aAAsC;IAK3E,MAAMC,UAAUD,cAAcE,GAAG,CAAC,CAAC,EAACC,cAAc,EAAEC,YAAY,EAAC,GAAM,CAAA;YACrEC,UAAUF,iBAAiB,QAAQ;YACnCG,MAAM,GAAGF,aAAaE,IAAI,CAAC,EAAE,EAAEF,aAAaG,EAAE,CAAC,CAAC,CAAC;YACjDC,OAAOJ,aAAaG,EAAE;QACxB,CAAA;IAEAN,QAAQQ,IAAI,CACV;QAACJ,UAAU;QAAMC,MAAM;QAAaE,OAAO;IAAiB,GAC5D;QAACH,UAAU;QAAOC,MAAM;QAA2BE,OAAO;IAAO,GACjE;QAACH,UAAU;QAAMC,MAAM;QAAaE,OAAO;IAAkB;IAG/D,OAAOP;AACT"}
+{"version":3,"sources":["../../../src/actions/organizations/getOrganizationChoices.ts"],"sourcesContent":["import {Separator} from '@sanity/cli-core/ux'\n\nimport {type OrganizationWithGrant, type ProjectOrganization} from '../../services/organizations.js'\nimport {type OrganizationChoices} from './types.js'\n\nfunction isOrganizationWithGrant(\n  org: OrganizationWithGrant | ProjectOrganization,\n): org is OrganizationWithGrant {\n  return 'hasAttachGrant' in org\n}\n\nexport function getOrganizationChoices(organizations: ProjectOrganization[]): OrganizationChoices\nexport function getOrganizationChoices(organizations: OrganizationWithGrant[]): OrganizationChoices\nexport function getOrganizationChoices(\n  organizations: OrganizationWithGrant[] | ProjectOrganization[],\n): OrganizationChoices {\n  const choices = organizations.map((org) => {\n    if (isOrganizationWithGrant(org)) {\n      return {\n        disabled: org.hasAttachGrant ? false : 'Insufficient permissions',\n        name: `${org.organization.name} [${org.organization.id}]`,\n        value: org.organization.id,\n      }\n    }\n    return {name: `${org.name} [${org.id}]`, value: org.id}\n  })\n\n  return [\n    {name: 'Create new organization', value: '-new-'},\n    ...(choices.length > 0 ? [new Separator(), ...choices] : []),\n  ]\n}\n"],"names":["Separator","isOrganizationWithGrant","org","getOrganizationChoices","organizations","choices","map","disabled","hasAttachGrant","name","organization","id","value","length"],"mappings":"AAAA,SAAQA,SAAS,QAAO,sBAAqB;AAK7C,SAASC,wBACPC,GAAgD;IAEhD,OAAO,oBAAoBA;AAC7B;AAIA,OAAO,SAASC,uBACdC,aAA8D;IAE9D,MAAMC,UAAUD,cAAcE,GAAG,CAAC,CAACJ;QACjC,IAAID,wBAAwBC,MAAM;YAChC,OAAO;gBACLK,UAAUL,IAAIM,cAAc,GAAG,QAAQ;gBACvCC,MAAM,GAAGP,IAAIQ,YAAY,CAACD,IAAI,CAAC,EAAE,EAAEP,IAAIQ,YAAY,CAACC,EAAE,CAAC,CAAC,CAAC;gBACzDC,OAAOV,IAAIQ,YAAY,CAACC,EAAE;YAC5B;QACF;QACA,OAAO;YAACF,MAAM,GAAGP,IAAIO,IAAI,CAAC,EAAE,EAAEP,IAAIS,EAAE,CAAC,CAAC,CAAC;YAAEC,OAAOV,IAAIS,EAAE;QAAA;IACxD;IAEA,OAAO;QACL;YAACF,MAAM;YAA2BG,OAAO;QAAO;WAC5CP,QAAQQ,MAAM,GAAG,IAAI;YAAC,IAAIb;eAAgBK;SAAQ,GAAG,EAAE;KAC5D;AACH"}

package/dist/actions/organizations/types.js

@@ -0,0 +1,3 @@
+export { };
+
+//# sourceMappingURL=types.js.map

package/dist/actions/organizations/types.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/organizations/types.ts"],"sourcesContent":["import {Separator} from '@sanity/cli-core/ux'\n\nexport type OrganizationChoices = Array<\n  Separator | {disabled?: boolean | string; name: string; value: string}\n>\n"],"names":[],"mappings":"AAEA,WAEC"}

package/dist/actions/projects/getManageUrl.js

@@ -1,7 +1,6 @@
 import { getSanityUrl } from '@sanity/cli-core';
 export function getManageUrl(projectId) {
-    const sanityUrl = getSanityUrl();
-    return projectId ? `${sanityUrl}/manage/project/${projectId}` : `${sanityUrl}/manage/`;
+    return projectId ? getSanityUrl(`/manage/project/${projectId}`) : getSanityUrl('/manage/');
 }
 
 //# sourceMappingURL=getManageUrl.js.map

package/dist/actions/projects/getManageUrl.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/projects/getManageUrl.ts"],"sourcesContent":["import {getSanityUrl} from '@sanity/cli-core'\n\nexport function getManageUrl(projectId: string | undefined): string {\n  const sanityUrl = getSanityUrl()\n  return projectId ? `${sanityUrl}/manage/project/${projectId}` : `${sanityUrl}/manage/`\n}\n"],"names":["getSanityUrl","getManageUrl","projectId","sanityUrl"],"mappings":"AAAA,SAAQA,YAAY,QAAO,mBAAkB;AAE7C,OAAO,SAASC,aAAaC,SAA6B;IACxD,MAAMC,YAAYH;IAClB,OAAOE,YAAY,GAAGC,UAAU,gBAAgB,EAAED,WAAW,GAAG,GAAGC,UAAU,QAAQ,CAAC;AACxF"}
+{"version":3,"sources":["../../../src/actions/projects/getManageUrl.ts"],"sourcesContent":["import {getSanityUrl} from '@sanity/cli-core'\n\nexport function getManageUrl(projectId: string | undefined): string {\n  return projectId ? getSanityUrl(`/manage/project/${projectId}`) : getSanityUrl('/manage/')\n}\n"],"names":["getSanityUrl","getManageUrl","projectId"],"mappings":"AAAA,SAAQA,YAAY,QAAO,mBAAkB;AAE7C,OAAO,SAASC,aAAaC,SAA6B;IACxD,OAAOA,YAAYF,aAAa,CAAC,gBAAgB,EAAEE,WAAW,IAAIF,aAAa;AACjF"}

package/dist/actions/schema/deleteSchemaAction.js

@@ -1,10 +1,9 @@
 import { styleText } from 'node:util';
+import { CLIError } from '@oclif/core/errors';
+import { studioWorkerTask } from '@sanity/cli-core';
 import { deleteSchema } from '../../services/schemas.js';
 import { isDefined } from '../manifest/schemaTypeHelpers.js';
-import { ensureManifestExtractSatisfied } from './utils/manifestExtractor.js';
-import { createManifestReader } from './utils/manifestReader.js';
 import { getDatasetsOutString, getStringList } from './utils/schemaStoreOutStrings.js';
-import { filterLogReadProjectIdMismatch } from './utils/schemaStoreValidation.js';
 // Native implementation instead of lodash/uniq
 function uniq(array) {
     return [
@@ -21,31 +20,17 @@ class DeleteIdError extends Error {
         this.dataset = dataset;
     }
 }
-/**
- * Deletes all stored schemas matching --ids in workspace datasets.
- *
- * Workspaces are determined by on-disk manifest file – not directly from sanity.config.
- * All schema store actions require a manifest to exist, so we regenerate it by default.
- * Manifest generation can be optionally disabled with --no-manifest-extract.
- * In this case the command uses and existing file or throws when missing.
- */ export async function deleteSchemaAction(options) {
-    const { dataset, extractManifest, ids, manifestDir, output, projectId, verbose, workDir } = options;
-    if (!await ensureManifestExtractSatisfied({
-        extractManifest,
-        manifestDir,
-        output,
-        schemaRequired: true,
-        workDir
-    })) {
-        return 'failure';
-    }
-    const manifest = await createManifestReader({
-        manifestDir,
-        output,
-        workDir
-    }).getManifest();
-    const workspaces = manifest.workspaces.filter((workspace)=>!dataset || workspace.dataset === dataset).filter((workspace)=>filterLogReadProjectIdMismatch(workspace, projectId, output));
-    const datasets = uniq(workspaces.map((w)=>w.dataset));
+export async function deleteSchemaAction(options) {
+    const { configPath, dataset, ids, output, projectId, verbose, workDir } = options;
+    const projectDatasets = await studioWorkerTask(new URL('uniqueWorkspaces.worker.js', import.meta.url), {
+        name: 'uniqueWorkspaces',
+        studioRootPath: workDir,
+        workerData: {
+            configPath,
+            dataset
+        }
+    });
+    const datasets = projectDatasets.map((w)=>w.dataset);
     const results = await Promise.allSettled(datasets.flatMap((targetDataset)=>{
         return ids.map(async ({ schemaId })=>{
             try {
@@ -83,7 +68,7 @@ class DeleteIdError extends Error {
     if (success) {
         output.log(`Successfully deleted ${uniqueDeletedSchemaIds.length}/${ids.length} schemas`);
     } else {
-        output.error([
+        throw new CLIError([
             `Deleted ${uniqueDeletedSchemaIds.length}/${ids.length} schemas.`,
             deletedIds.length > 0 ? `Successfully deleted ids:\n${deletedIds.map(({ dataset: targetDataset, schemaId })=>`- "${schemaId}" (in ${getDatasetsOutString([
                     targetDataset
@@ -95,7 +80,6 @@ class DeleteIdError extends Error {
             ] : []
         ].filter((item)=>isDefined(item)).join('\n'));
     }
-    return success ? 'success' : 'failure';
 }
 
 //# sourceMappingURL=deleteSchemaAction.js.map

package/dist/actions/schema/deleteSchemaAction.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/schema/deleteSchemaAction.ts"],"sourcesContent":["import {styleText} from 'node:util'\n\nimport {type Output} from '@sanity/cli-core'\n\nimport {deleteSchema} from '../../services/schemas.js'\nimport {isDefined} from '../manifest/schemaTypeHelpers.js'\nimport {type SchemaStoreActionResult} from './schemaStoreTypes.js'\nimport {ensureManifestExtractSatisfied} from './utils/manifestExtractor.js'\nimport {createManifestReader} from './utils/manifestReader.js'\nimport {getDatasetsOutString, getStringList} from './utils/schemaStoreOutStrings.js'\nimport {\n  filterLogReadProjectIdMismatch,\n  type WorkspaceSchemaId,\n} from './utils/schemaStoreValidation.js'\n\n// Native implementation instead of lodash/uniq\nfunction uniq<T>(array: T[]): T[] {\n  return [...new Set(array)]\n}\n\ninterface DeleteSchemasOptions {\n  extractManifest: boolean\n  ids: WorkspaceSchemaId[]\n  manifestDir: string\n  output: Output\n  projectId: string\n  verbose: boolean\n  workDir: string\n\n  dataset?: string\n}\n\ninterface DeleteResult {\n  dataset: string\n  deleted: boolean\n  schemaId: string\n}\n\nclass DeleteIdError extends Error {\n  public dataset: string\n  public id: string\n  constructor(id: string, dataset: string, options?: ErrorOptions) {\n    super((options?.cause as {message?: string})?.message, options)\n    this.name = 'DeleteIdError'\n    this.id = id\n    this.dataset = dataset\n  }\n}\n\n/**\n * Deletes all stored schemas matching --ids in workspace datasets.\n *\n * Workspaces are determined by on-disk manifest file – not directly from sanity.config.\n * All schema store actions require a manifest to exist, so we regenerate it by default.\n * Manifest generation can be optionally disabled with --no-manifest-extract.\n * In this case the command uses and existing file or throws when missing.\n */\nexport async function deleteSchemaAction(\n  options: DeleteSchemasOptions,\n): Promise<SchemaStoreActionResult> {\n  const {dataset, extractManifest, ids, manifestDir, output, projectId, verbose, workDir} = options\n\n  if (\n    !(await ensureManifestExtractSatisfied({\n      extractManifest,\n      manifestDir,\n      output,\n      schemaRequired: true,\n      workDir,\n    }))\n  ) {\n    return 'failure'\n  }\n\n  const manifest = await createManifestReader({\n    manifestDir,\n    output,\n    workDir,\n  }).getManifest()\n\n  const workspaces = manifest.workspaces\n    .filter((workspace) => !dataset || workspace.dataset === dataset)\n    .filter((workspace) => filterLogReadProjectIdMismatch(workspace, projectId, output))\n\n  const datasets = uniq(workspaces.map((w) => w.dataset))\n\n  const results = await Promise.allSettled(\n    datasets.flatMap((targetDataset: string) => {\n      return ids.map(async ({schemaId}): Promise<DeleteResult> => {\n        try {\n          const deletedSchema = await deleteSchema(targetDataset, projectId, schemaId)\n          return {dataset: targetDataset, deleted: deletedSchema.deleted, schemaId}\n        } catch (err) {\n          throw new DeleteIdError(schemaId, targetDataset, {cause: err})\n        }\n      })\n    }),\n  )\n\n  const deletedIds = results\n    .filter((r): r is PromiseFulfilledResult<DeleteResult> => r.status === 'fulfilled')\n    .filter((r) => r.value.deleted)\n    .map((r) => r.value)\n\n  const notFound = uniq(\n    results\n      .filter((r): r is PromiseFulfilledResult<DeleteResult> => r.status === 'fulfilled')\n      .filter((r) => !r.value.deleted)\n      .filter((r) => !deletedIds.map(({schemaId}) => schemaId).includes(r.value.schemaId))\n      .map((r) => r.value.schemaId),\n  )\n\n  const deleteFailureIds = uniq(\n    results\n      .filter((r) => r.status === 'rejected')\n      .map((result) => {\n        const error = result.reason\n        if (error instanceof DeleteIdError) {\n          output.warn(\n            styleText(\n              'red',\n              [\n                `Failed to delete schema \"${error.id}\" in dataset \"${error.dataset}\":`,\n                error.message,\n              ].join('\\n'),\n            ),\n          )\n          if (verbose) output.warn(error)\n          return error.id\n        }\n        //hubris inc: given the try-catch wrapping the full promise \"this should never happen\"\n        throw error\n      }),\n  )\n\n  // Compare unique schema IDs deleted vs requested (not total deletions across datasets)\n  const uniqueDeletedSchemaIds = uniq(deletedIds.map(({schemaId}) => schemaId))\n  const success = uniqueDeletedSchemaIds.length === ids.length\n  if (success) {\n    output.log(`Successfully deleted ${uniqueDeletedSchemaIds.length}/${ids.length} schemas`)\n  } else {\n    output.error(\n      [\n        `Deleted ${uniqueDeletedSchemaIds.length}/${ids.length} schemas.`,\n        deletedIds.length > 0\n          ? `Successfully deleted ids:\\n${deletedIds\n              .map(\n                ({dataset: targetDataset, schemaId}) =>\n                  `- \"${schemaId}\" (in ${getDatasetsOutString([targetDataset])})`,\n              )\n              .join('\\n')}`\n          : undefined,\n        notFound.length > 0\n          ? `Ids not found in ${getDatasetsOutString(datasets)}:\\n${getStringList(notFound)}`\n          : undefined,\n        ...(deleteFailureIds.length > 0\n          ? [`Failed to delete ids:\\n${getStringList(deleteFailureIds)}`, 'Check logs for errors.']\n          : []),\n      ]\n        .filter((item) => isDefined(item))\n        .join('\\n'),\n    )\n  }\n\n  return success ? 'success' : 'failure'\n}\n"],"names":["styleText","deleteSchema","isDefined","ensureManifestExtractSatisfied","createManifestReader","getDatasetsOutString","getStringList","filterLogReadProjectIdMismatch","uniq","array","Set","DeleteIdError","Error","dataset","id","options","cause","message","name","deleteSchemaAction","extractManifest","ids","manifestDir","output","projectId","verbose","workDir","schemaRequired","manifest","getManifest","workspaces","filter","workspace","datasets","map","w","results","Promise","allSettled","flatMap","targetDataset","schemaId","deletedSchema","deleted","err","deletedIds","r","status","value","notFound","includes","deleteFailureIds","result","error","reason","warn","join","uniqueDeletedSchemaIds","success","length","log","undefined","item"],"mappings":"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"}
+{"version":3,"sources":["../../../src/actions/schema/deleteSchemaAction.ts"],"sourcesContent":["import {styleText} from 'node:util'\n\nimport {CLIError} from '@oclif/core/errors'\nimport {type Output, studioWorkerTask} from '@sanity/cli-core'\nimport {type Workspace} from 'sanity'\n\nimport {deleteSchema} from '../../services/schemas.js'\nimport {isDefined} from '../manifest/schemaTypeHelpers.js'\nimport {type UniqWorkspaceWorkerData} from './types.js'\nimport {getDatasetsOutString, getStringList} from './utils/schemaStoreOutStrings.js'\nimport {type WorkspaceSchemaId} from './utils/schemaStoreValidation.js'\n\n// Native implementation instead of lodash/uniq\nfunction uniq<T>(array: T[]): T[] {\n  return [...new Set(array)]\n}\n\ninterface DeleteSchemasOptions {\n  configPath: string\n  ids: WorkspaceSchemaId[]\n  output: Output\n  projectId: string\n  verbose: boolean\n  workDir: string\n\n  dataset?: string\n}\n\ninterface DeleteResult {\n  dataset: string\n  deleted: boolean\n  schemaId: string\n}\n\nclass DeleteIdError extends Error {\n  public dataset: string\n  public id: string\n  constructor(id: string, dataset: string, options?: ErrorOptions) {\n    super((options?.cause as {message?: string})?.message, options)\n    this.name = 'DeleteIdError'\n    this.id = id\n    this.dataset = dataset\n  }\n}\n\nexport async function deleteSchemaAction(options: DeleteSchemasOptions): Promise<void> {\n  const {configPath, dataset, ids, output, projectId, verbose, workDir} = options\n\n  const projectDatasets = await studioWorkerTask<(Workspace & {key: string})[]>(\n    new URL('uniqueWorkspaces.worker.js', import.meta.url),\n    {\n      name: 'uniqueWorkspaces',\n      studioRootPath: workDir,\n      workerData: {configPath, dataset} satisfies UniqWorkspaceWorkerData,\n    },\n  )\n\n  const datasets = projectDatasets.map((w) => w.dataset)\n\n  const results = await Promise.allSettled(\n    datasets.flatMap((targetDataset: string) => {\n      return ids.map(async ({schemaId}): Promise<DeleteResult> => {\n        try {\n          const deletedSchema = await deleteSchema(targetDataset, projectId, schemaId)\n          return {dataset: targetDataset, deleted: deletedSchema.deleted, schemaId}\n        } catch (err) {\n          throw new DeleteIdError(schemaId, targetDataset, {cause: err})\n        }\n      })\n    }),\n  )\n\n  const deletedIds = results\n    .filter((r): r is PromiseFulfilledResult<DeleteResult> => r.status === 'fulfilled')\n    .filter((r) => r.value.deleted)\n    .map((r) => r.value)\n\n  const notFound = uniq(\n    results\n      .filter((r): r is PromiseFulfilledResult<DeleteResult> => r.status === 'fulfilled')\n      .filter((r) => !r.value.deleted)\n      .filter((r) => !deletedIds.map(({schemaId}) => schemaId).includes(r.value.schemaId))\n      .map((r) => r.value.schemaId),\n  )\n\n  const deleteFailureIds = uniq(\n    results\n      .filter((r) => r.status === 'rejected')\n      .map((result) => {\n        const error = result.reason\n        if (error instanceof DeleteIdError) {\n          output.warn(\n            styleText(\n              'red',\n              [\n                `Failed to delete schema \"${error.id}\" in dataset \"${error.dataset}\":`,\n                error.message,\n              ].join('\\n'),\n            ),\n          )\n          if (verbose) output.warn(error)\n          return error.id\n        }\n        //hubris inc: given the try-catch wrapping the full promise \"this should never happen\"\n        throw error\n      }),\n  )\n\n  // Compare unique schema IDs deleted vs requested (not total deletions across datasets)\n  const uniqueDeletedSchemaIds = uniq(deletedIds.map(({schemaId}) => schemaId))\n  const success = uniqueDeletedSchemaIds.length === ids.length\n  if (success) {\n    output.log(`Successfully deleted ${uniqueDeletedSchemaIds.length}/${ids.length} schemas`)\n  } else {\n    throw new CLIError(\n      [\n        `Deleted ${uniqueDeletedSchemaIds.length}/${ids.length} schemas.`,\n        deletedIds.length > 0\n          ? `Successfully deleted ids:\\n${deletedIds\n              .map(\n                ({dataset: targetDataset, schemaId}) =>\n                  `- \"${schemaId}\" (in ${getDatasetsOutString([targetDataset])})`,\n              )\n              .join('\\n')}`\n          : undefined,\n        notFound.length > 0\n          ? `Ids not found in ${getDatasetsOutString(datasets)}:\\n${getStringList(notFound)}`\n          : undefined,\n        ...(deleteFailureIds.length > 0\n          ? [`Failed to delete ids:\\n${getStringList(deleteFailureIds)}`, 'Check logs for errors.']\n          : []),\n      ]\n        .filter((item) => isDefined(item))\n        .join('\\n'),\n    )\n  }\n}\n"],"names":["styleText","CLIError","studioWorkerTask","deleteSchema","isDefined","getDatasetsOutString","getStringList","uniq","array","Set","DeleteIdError","Error","dataset","id","options","cause","message","name","deleteSchemaAction","configPath","ids","output","projectId","verbose","workDir","projectDatasets","URL","url","studioRootPath","workerData","datasets","map","w","results","Promise","allSettled","flatMap","targetDataset","schemaId","deletedSchema","deleted","err","deletedIds","filter","r","status","value","notFound","includes","deleteFailureIds","result","error","reason","warn","join","uniqueDeletedSchemaIds","success","length","log","undefined","item"],"mappings":"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"}

package/dist/actions/schema/deploySchemas.js

@@ -1,98 +1,29 @@
-import { styleText } from 'node:util';
-import { updateSchemas } from '../../services/schemas.js';
-import { CURRENT_WORKSPACE_SCHEMA_VERSION } from '../manifest/types.js';
-import { schemasDeployDebug } from './utils/debug.js';
-import { ensureManifestExtractSatisfied } from './utils/manifestExtractor.js';
-import { createManifestReader } from './utils/manifestReader.js';
-import { FlagValidationError, SCHEMA_PERMISSION_HELP_TEXT } from './utils/schemaStoreValidation.js';
-import { getWorkspaceSchemaId } from './utils/workspaceSchemaId.js';
+import { studioWorkerTask } from '@sanity/cli-core';
+import { updateWorkspacesSchemas } from './updateWorkspaceSchema.js';
+import { SchemaExtractionError } from './utils/SchemaExtractionError.js';
 export async function deploySchemas(options) {
-    const { extractManifest, manifestDir, manifestSafe, output, schemaRequired, tag, verbose, workDir, workspaceName } = options;
-    if (!await ensureManifestExtractSatisfied({
-        extractManifest,
-        manifestDir,
-        manifestSafe,
-        output,
-        schemaRequired,
-        workDir
-    })) {
-        return 'failure';
-    }
-    try {
-        const manifestReader = await createManifestReader({
-            manifestDir,
-            output,
+    const { tag, verbose, workDir, workspaceName } = options;
+    const result = await studioWorkerTask(new URL('extractSanityWorkspace.worker.js', import.meta.url), {
+        name: 'extractSanityWorkspace',
+        studioRootPath: workDir,
+        workerData: {
+            configPath: workDir,
             workDir
-        });
-        const manifest = await manifestReader.getManifest();
-        const workspaces = manifest.workspaces.filter((workspace)=>!workspaceName || workspace.name === workspaceName);
-        if (workspaces.length === 0) {
-            const error = workspaceName ? new FlagValidationError(`Found no workspaces named "${workspaceName}"`) : new Error('Workspace array in manifest is empty.');
-            throw error;
-        }
-        const updateSchema = getUpdateSchema({
-            manifestReader,
-            output,
-            tag,
-            verbose
-        });
-        /* Known caveat: we _don't_ rollback failed operations or partial success */ const results = await Promise.allSettled(workspaces.map(async (workspace)=>{
-            await updateSchema(workspace);
-        }));
-        const fulfilledUpdates = results.filter((result)=>result.status === 'fulfilled');
-        const rejectedUpdates = results.filter((result)=>result.status === 'rejected');
-        if (rejectedUpdates.length > 0) {
-            throw new Error(`Failed to deploy ${rejectedUpdates.length}/${workspaces.length} schemas. Successfully deployed ${fulfilledUpdates.length}/${workspaces.length} schemas.`);
-        }
-        output.log(`Deployed ${fulfilledUpdates.length}/${workspaces.length} schemas`);
-        return 'success';
-    } catch (err) {
-        if (schemaRequired || err instanceof FlagValidationError) {
-            output.error(err.message);
-        } else {
-            output.error(`↳ Error when storing schemas:\n  ${err.message}`);
         }
-        schemasDeployDebug('Error updating schemas', err.message);
-        return 'failure';
-    } finally{
-        output.log(`${styleText('gray', '↳ List deployed schemas with:')} ${styleText('cyan', 'sanity schema list')}`);
+    });
+    if (result.type === 'error') {
+        throw new SchemaExtractionError(result.error, result.validation);
     }
-}
-function getUpdateSchema(args) {
-    const { manifestReader, output, tag, verbose } = args;
-    return async (workspace)=>{
-        const { dataset, projectId } = workspace;
-        const { idWarning, safeBaseId: id } = getWorkspaceSchemaId({
-            tag,
-            workspaceName: workspace.name
-        });
-        if (idWarning) output.warn(idWarning);
-        try {
-            const schema = await manifestReader.getWorkspaceSchema(workspace.name);
-            await updateSchemas(dataset, projectId, [
-                {
-                    // the API will stringify the schema – we send as JSON
-                    schema,
-                    tag,
-                    version: CURRENT_WORKSPACE_SCHEMA_VERSION,
-                    workspace: {
-                        name: workspace.name,
-                        title: workspace.title
-                    }
-                }
-            ]);
-            if (verbose) {
-                output.log(styleText('gray', `↳ schemaId: ${id}, projectId: ${projectId}, dataset: ${dataset}`));
-            }
-        } catch (err) {
-            if ('statusCode' in err && err?.statusCode === 401) {
-                output.warn(`↳ No permissions to write schema for workspace "${workspace.name}" in dataset "${workspace.dataset}". ${SCHEMA_PERMISSION_HELP_TEXT}:\n  ${styleText('red', `${err.message}`)}`);
-            } else {
-                output.error(`↳ Error deploying schema for workspace "${workspace.name}":\n  ${styleText('red', `${err.message}`)}`);
-            }
-            throw err;
-        }
-    };
+    const workspaces = result.workspaces.filter((workspace)=>!workspaceName || workspace.name === workspaceName);
+    if (workspaces.length === 0) {
+        const error = workspaceName ? new Error(`Found no workspaces named "${workspaceName}"`) : new Error('No workspaces found');
+        throw error;
+    }
+    await updateWorkspacesSchemas({
+        tag,
+        verbose,
+        workspaces
+    });
 }
 
 //# sourceMappingURL=deploySchemas.js.map