@editframe/cli 0.10.0-beta.7 → 0.11.0-beta.2

package/dist/VERSION.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.10.0-beta.7";
+export declare const VERSION = "0.11.0-beta.2";

package/dist/VERSION.js

@@ -1,4 +1,4 @@
-const VERSION = "0.10.0-beta.7";
+const VERSION = "0.11.0-beta.2";
 export {
   VERSION
 };

package/dist/operations/syncAssetsDirectory/SyncCaption.d.ts

@@ -1,4 +1,4 @@
-import { CreateCaptionFileResult } from '../../../../api/src';
+import { CreateCaptionFileResult } from '../../../../api/src/index.ts';
 import { SubAssetSync } from './SubAssetSync.ts';
 import { SyncStatus } from './SyncStatus.ts';
 export declare class SyncCaption implements SubAssetSync<CreateCaptionFileResult> {

package/dist/operations/syncAssetsDirectory/SyncFragmentIndex.d.ts

@@ -1,4 +1,4 @@
-import { CreateISOBMFFFileResult } from '../../../../api/src';
+import { CreateISOBMFFFileResult } from '../../../../api/src/index.ts';
 import { SubAssetSync } from './SubAssetSync.ts';
 import { SyncStatus } from './SyncStatus.ts';
 export declare class SyncFragmentIndex implements SubAssetSync<CreateISOBMFFFileResult> {

package/dist/operations/syncAssetsDirectory/SyncImage.d.ts

@@ -1,5 +1,5 @@
-import { CreateImageFileResult } from '../../../../api/src';
-import { Probe } from '../../../../assets/src';
+import { CreateImageFileResult } from '../../../../api/src/index.ts';
+import { Probe } from '../../../../assets/src/index.ts';
 import { SubAssetSync } from './SubAssetSync.ts';
 import { SyncStatus } from './SyncStatus.ts';
 export declare class SyncImage implements SubAssetSync<CreateImageFileResult> {

package/dist/operations/syncAssetsDirectory/SyncImage.js

@@ -60,18 +60,18 @@ class SyncImage {
   isComplete() {
     return !!this.created?.complete;
   }
-  upload() {
+  async upload() {
     if (!this.created) {
       throw new Error(
         "Image not created. Should have been prevented by .isComplete()"
       );
     }
-    return uploadImageFile(
+    await uploadImageFile(
       getClient(),
       this.created.id,
       createReadStream(this.path),
       Number.parseInt(this.probeResult.format.size || "0")
-    );
+    ).whenUploaded();
   }
   async markSynced() {
     if (!this.created) {

package/dist/operations/syncAssetsDirectory/SyncTrack.d.ts

@@ -1,5 +1,5 @@
-import { CreateISOBMFFFileResult, CreateISOBMFFTrackResult } from '../../../../api/src';
-import { Probe } from '../../../../assets/src';
+import { CreateISOBMFFFileResult, CreateISOBMFFTrackResult } from '../../../../api/src/index.ts';
+import { Probe } from '../../../../assets/src/index.ts';
 import { SubAssetSync } from './SubAssetSync.ts';
 import { SyncStatus } from './SyncStatus.ts';
 export declare class SyncTrack implements SubAssetSync<CreateISOBMFFTrackResult> {

package/dist/operations/syncAssetsDirectory/SyncTrack.js

@@ -98,13 +98,13 @@ class SyncTrack {
         "Track not created. Should have been prevented by .isComplete()"
       );
     }
-    return uploadISOBMFFTrack(
+    await uploadISOBMFFTrack(
       getClient(),
       this.isoFile.id,
       Number(this.trackId),
       createReadStream(this.path),
       this.created?.byte_size
-    );
+    ).whenUploaded();
   }
   async markSynced() {
     if (!this.created) {

package/dist/utils/index.d.ts

@@ -1,2 +1,2 @@
-import { Client } from '../../../api/src';
+import { Client } from '../../../api/src/index.ts';
 export declare const getClient: () => Client;

package/dist/utils/index.js

@@ -5,10 +5,14 @@ let client;
 const getClient = () => {
   if (!client) {
     const programOpts = program.opts();
-    client = new Client(
-      programOpts.token || process.env.EF_TOKEN,
-      programOpts.efHost || process.env.EF_HOST
-    );
+    const token = programOpts.token || process.env.EF_TOKEN;
+    const efHost = programOpts.efHost || process.env.EF_HOST;
+    if (!token) {
+      throw new Error(
+        "EF_TOKEN must be set or supplied as command line argument"
+      );
+    }
+    client = new Client(token, efHost);
   }
   return client;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@editframe/cli",
-  "version": "0.10.0-beta.7",
+  "version": "0.11.0-beta.2",
   "description": "Command line interface for EditFrame",
   "bin": {
     "editframe": "./dist/index.js"
@@ -23,10 +23,10 @@
     "vite-tsconfig-paths": "^4.3.2"
   },
   "dependencies": {
-    "@editframe/api": "0.10.0-beta.7",
-    "@editframe/assets": "0.10.0-beta.7",
-    "@editframe/elements": "0.10.0-beta.7",
-    "@editframe/vite-plugin": "0.10.0-beta.7",
+    "@editframe/api": "0.11.0-beta.2",
+    "@editframe/assets": "0.11.0-beta.2",
+    "@editframe/elements": "0.11.0-beta.2",
+    "@editframe/vite-plugin": "0.11.0-beta.2",
     "@inquirer/prompts": "^5.3.8",
     "axios": "^1.6.8",
     "chalk": "^5.3.0",

package/src/operations/syncAssetsDirectory/SyncImage.test.ts

@@ -70,9 +70,7 @@ describe("SyncImage", async () => {
         test("throws when not created", async () => {
           const syncImage = new SyncImage(await cacheImage(image!), image!.md5);
           await syncImage.prepare();
-          // This is throwing syncronously because the error is thrown before
-          // any async operations are awaited.
-          expect(() => syncImage.upload()).toThrow();
+          await expect(() => syncImage.upload()).rejects.toThrow();
         });
         test("uploads image", async () => {
           server.use(

package/src/operations/syncAssetsDirectory/SyncImage.ts

@@ -80,18 +80,18 @@ export class SyncImage implements SubAssetSync<CreateImageFileResult> {
   isComplete() {
     return !!this.created?.complete;
   }
-  upload() {
+  async upload() {
     if (!this.created) {
       throw new Error(
         "Image not created. Should have been prevented by .isComplete()",
       );
     }
-    return uploadImageFile(
+    await uploadImageFile(
       getClient(),
       this.created.id,
       createReadStream(this.path),
       Number.parseInt(this.probeResult.format.size || "0"),
-    );
+    ).whenUploaded();
   }
   async markSynced() {
     if (!this.created) {

package/src/operations/syncAssetsDirectory/SyncTrack.ts

@@ -127,13 +127,13 @@ export class SyncTrack implements SubAssetSync<CreateISOBMFFTrackResult> {
         "Track not created. Should have been prevented by .isComplete()",
       );
     }
-    return uploadISOBMFFTrack(
+    await uploadISOBMFFTrack(
       getClient(),
       this.isoFile.id,
       Number(this.trackId),
       createReadStream(this.path),
       this.created?.byte_size,
-    );
+    ).whenUploaded();
   }
   async markSynced() {
     if (!this.created) {

package/src/utils/index.ts

@@ -7,10 +7,14 @@ let client: Client;
 export const getClient = () => {
   if (!client) {
     const programOpts = program.opts();
-    client = new Client(
-      programOpts.token || process.env.EF_TOKEN,
-      programOpts.efHost || process.env.EF_HOST,
-    );
+    const token = programOpts.token || process.env.EF_TOKEN;
+    const efHost = programOpts.efHost || process.env.EF_HOST;
+    if (!token) {
+      throw new Error(
+        "EF_TOKEN must be set or supplied as command line argument",
+      );
+    }
+    client = new Client(token, efHost);
   }
   return client;
 };

package/dist/test-fixtures/fixture.d.ts

@@ -1,26 +0,0 @@
-import { SyncStatusInfo } from '../src/operations/syncAssetsDirectory/SyncStatus.ts';
-export declare const fixture: (fixture: string, name: string) => Promise<Fixture>;
-export interface Fixture {
-    name: string;
-    fixture: string;
-    md5: string;
-    content: Buffer;
-    originalPath: string;
-    write: (dir: string) => Promise<void>;
-}
-export declare const withFixtures: (fixtures: Promise<Fixture>[], fn: (props: {
-    files: Fixture[];
-    rootDir: string;
-    srcDir: string;
-    assetsDir: string;
-    cacheDir: string;
-    expectCacheFiles: (fixture: Fixture, files: string[]) => Promise<void>;
-    expectInfoFileContent: (fileName: string, fixture: Fixture, expectedContent: Pick<SyncStatusInfo, "complete" | "id"> & {
-        byte_size?: number;
-    }) => Promise<void>;
-    syncAssetsDirectory: () => Promise<void>;
-    cacheImage: (fixture: Fixture) => Promise<string>;
-    generateTrack: (fixture: Fixture, trackId: number) => Promise<string>;
-    generateTrackFragmentIndex: (fixture: Fixture) => Promise<string>;
-    generateCaptions: (fixture: Fixture) => Promise<string>;
-}) => Promise<void>) => Promise<void>;