@uniformdev/cli 19.49.1 → 19.49.4-alpha.67

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 type SyncMode = 'mirror' | 'createOrUpdate' | 'create';
-type EntityTypes = 'category' | 'dataType' | 'quirk' | 'test' | 'signal' | 'enrichment' | 'aggregate' | 'component' | 'composition' | 'pattern' | 'projectMapDefinition' | 'projectMapNode' | 'redirect';
+type EntityTypes = 'category' | 'dataType' | 'quirk' | 'test' | 'signal' | 'enrichment' | 'aggregate' | 'component' | 'composition' | 'pattern' | 'projectMapDefinition' | 'projectMapNode' | 'redirect' | 'entry' | 'contentType';
 type SyncFileFormat = 'yaml' | 'json';
 type EntityConfiguration = {
     mode?: SyncMode;

package/dist/index.mjs

@@ -605,6 +605,13 @@ function createSyncEngineConsoleLogger(options) {
     );
   };
 }
+function createPublishStatusSyncEngineConsoleLogger(options) {
+  const { indent, prefix, status } = options ?? {};
+  return function syncEngineConsoleLogger({ displayName, whatIf }) {
+    const actionTag = status === "publish" ? green("[P]") : yellow("[U]");
+    console.log(`${indent ?? ""}${whatIf ? gray("[WHATIF]") : ""}${actionTag}${prefix ?? ""} ${displayName}`);
+  };
+}
 
 // src/commands/canvas/commands/category/get.ts
 var CategoryGetModule = {
@@ -765,6 +772,7 @@ var CategoryPullModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource: true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -1071,6 +1079,7 @@ var ComponentPullModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource: true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -1203,7 +1212,10 @@ import yargs3 from "yargs";
 import { UncachedCanvasClient as UncachedCanvasClient7 } from "@uniformdev/canvas";
 
 // src/commands/canvas/util.ts
-import { CANVAS_DRAFT_STATE, CANVAS_PUBLISHED_STATE } from "@uniformdev/canvas";
+import {
+  CANVAS_DRAFT_STATE,
+  CANVAS_PUBLISHED_STATE
+} from "@uniformdev/canvas";
 function prepCompositionForDisk(composition) {
   const prepped = {
     ...composition
@@ -1479,7 +1491,6 @@ var CompositionPublishModule = {
     all,
     whatIf,
     project: projectId,
-    diff: diffMode,
     onlyCompositions,
     onlyPatterns
   }) => {
@@ -1510,7 +1521,7 @@ var CompositionPublishModule = {
       // Publishing is one-direction operation, so no need to support automatic un-publishing
       mode: "createOrUpdate",
       whatIf,
-      log: createSyncEngineConsoleLogger({ diffMode })
+      log: createPublishStatusSyncEngineConsoleLogger({ status: "publish" })
     });
   }
 };
@@ -1588,8 +1599,8 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
       fileUploadQueue.add(async () => {
         try {
           const fileAlreadyExistsChecks = await Promise.all([
-            options.fileClient.getFile({ projectId: options.projectId, url }).catch(() => null),
-            options.fileClient.getFile({ projectId: options.projectId, sourceId: hash }).catch(() => null)
+            options.fileClient.get({ url }).catch(() => null),
+            options.fileClient.get({ sourceId: hash }).catch(() => null)
           ]);
           if (fileAlreadyExistsChecks.some((check) => check !== null)) {
             return;
@@ -1621,13 +1632,12 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
               };
             }
           })();
-          const { id, method, uploadUrl } = await options.fileClient.createNewProjectFile({
+          const { id, method, uploadUrl } = await options.fileClient.insert({
             name: fileName,
             mediaType: preferredType(url.split(".").at(-1) ?? ""),
             size: fileBuffer.length,
             width,
             height,
-            projectId: options.projectId,
             sourceId: hash
           });
           const uploadResponse = await fetch(uploadUrl, {
@@ -1639,8 +1649,8 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
             return;
           }
           const checkForFile = async () => {
-            const file = await options.fileClient.getFile({ id });
-            if (!file || file.state !== FILE_READY_STATE) {
+            const file = await options.fileClient.get({ id });
+            if (!file || file.state !== FILE_READY_STATE || !file.url) {
               await new Promise((resolve2) => setTimeout(resolve2, 500));
               return checkForFile();
             }
@@ -1674,8 +1684,8 @@ var swapOutUniformFileUrlsForTargetProject = async (object, options) => {
       fileUrlReplacementQueue.add(async () => {
         try {
           const fileAlreadyExistsChecks = await Promise.all([
-            options.fileClient.getFile({ projectId: options.projectId, url }).catch(() => null),
-            options.fileClient.getFile({ projectId: options.projectId, sourceId: hash }).catch(() => null)
+            options.fileClient.get({ url }).catch(() => null),
+            options.fileClient.get({ sourceId: hash }).catch(() => null)
           ]);
           const file = fileAlreadyExistsChecks.find((check) => check !== null);
           if (!file) {
@@ -1778,6 +1788,7 @@ var CompositionPullModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource: true,
       log: createSyncEngineConsoleLogger({ diffMode }),
       onBeforeWriteObject: async (sourceObject) => {
         return extractAndDownloadUniformFilesForObject(sourceObject, {
@@ -1948,7 +1959,6 @@ var CompositionUnpublishModule = {
     onlyCompositions,
     onlyPatterns,
     project: projectId,
-    diff,
     whatIf
   }) => {
     if (!all && !ids || all && ids) {
@@ -1974,7 +1984,7 @@ var CompositionUnpublishModule = {
       onlyPatterns
     });
     const actions = [];
-    const log = createSyncEngineConsoleLogger({ diffMode: diff });
+    const log = createPublishStatusSyncEngineConsoleLogger({ status: "unpublish" });
     for await (const obj of target.objects) {
       if (Array.isArray(obj.id)) {
         obj.id.forEach((o) => targetItems.set(o, obj));
@@ -2193,6 +2203,7 @@ var ContentTypePullModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource: true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -2381,8 +2392,12 @@ function createDataTypeEngineDataSource({
   client
 }) {
   async function* getObjects() {
+    var _a;
     const dataTypes = (await client.get()).results;
     for await (const dataType of dataTypes) {
+      if (((_a = dataType.custom) == null ? void 0 : _a.uniformAutogenerated) === true) {
+        continue;
+      }
       const result = {
         id: selectIdentifier4(dataType),
         displayName: selectDisplayName4(dataType),
@@ -2484,6 +2499,7 @@ var DataTypePullModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource: true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
@@ -2658,7 +2674,10 @@ var EntryListModule = {
 };
 
 // src/commands/canvas/commands/entry/pull.ts
-import { ContentClient as ContentClient9 } from "@uniformdev/canvas";
+import { ContentClient as ContentClient10 } from "@uniformdev/canvas";
+
+// src/commands/canvas/entryEngineDataSource.ts
+import { convertEntryToPutEntry } from "@uniformdev/canvas";
 
 // src/commands/canvas/commands/entry/_util.ts
 var selectEntryIdentifier = (e) => e.entry._id;
@@ -2666,16 +2685,24 @@ var selectEntryDisplayName = (e) => `${e.entry._name ?? "Untitled"} (pid: ${e.en
 
 // src/commands/canvas/entryEngineDataSource.ts
 function createEntryEngineDataSource({
-  client
+  client,
+  state
 }) {
+  const stateId = convertCompositionState(state);
   async function* getObjects() {
-    const { entries } = await client.getEntries({ offset: 0, limit: 1e3 });
+    const { entries } = await client.getEntries({
+      offset: 0,
+      limit: 1e3,
+      skipDataResolution: true,
+      state: stateId,
+      withComponentIDs: true
+    });
     for await (const e of entries) {
       const result = {
         id: selectEntryIdentifier(e),
         displayName: selectEntryDisplayName(e),
         providerId: e.entry._id,
-        object: e
+        object: prepCompositionForDisk(e)
       };
       yield result;
     }
@@ -2686,7 +2713,7 @@ function createEntryEngineDataSource({
       await client.deleteEntry({ entryId: providerId });
     },
     writeObject: async ({ object }) => {
-      await client.upsertEntry(object);
+      await client.upsertEntry({ ...convertEntryToPutEntry(object), state: stateId });
     }
   };
 }
@@ -2698,28 +2725,30 @@ var EntryPullModule = {
   builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        withDiffOptions(
-          yargs25.positional("directory", {
-            describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
-            type: "string"
-          }).option("format", {
-            alias: ["f"],
-            describe: "Output format",
-            default: "yaml",
-            choices: ["yaml", "json"],
-            type: "string"
-          }).option("what-if", {
-            alias: ["w"],
-            describe: "What-if mode reports what would be done but changes no files",
-            default: false,
-            type: "boolean"
-          }).option("mode", {
-            alias: ["m"],
-            describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
-            choices: ["create", "createOrUpdate", "mirror"],
-            default: "mirror",
-            type: "string"
-          })
+        withStateOptions(
+          withDiffOptions(
+            yargs25.positional("directory", {
+              describe: "Directory to save the entries to. If a filename ending in yaml or json is used, a package file will be created instead of files in the directory.",
+              type: "string"
+            }).option("format", {
+              alias: ["f"],
+              describe: "Output format",
+              default: "yaml",
+              choices: ["yaml", "json"],
+              type: "string"
+            }).option("what-if", {
+              alias: ["w"],
+              describe: "What-if mode reports what would be done but changes no files",
+              default: false,
+              type: "boolean"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new files, update nothing. "createOrUpdate" = create new files, update existing, delete nothing. "mirror" = create, update, and delete to mirror state',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
+          )
         )
       )
     )
@@ -2732,18 +2761,19 @@ var EntryPullModule = {
     format,
     mode,
     whatIf,
+    state,
     project: projectId,
     diff: diffMode
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient9({
+    const client = new ContentClient10({
       apiKey,
       apiHost,
       fetch: fetch3,
       projectId,
       bypassCache: true
     });
-    const source = createEntryEngineDataSource({ client });
+    const source = createEntryEngineDataSource({ client, state });
     let target;
     const isPackage = isPathAPackageFile(directory);
     if (isPackage) {
@@ -2770,35 +2800,38 @@ var EntryPullModule = {
       target,
       mode,
       whatIf,
+      allowEmptySource: true,
       log: createSyncEngineConsoleLogger({ diffMode })
     });
   }
 };
 
 // src/commands/canvas/commands/entry/push.ts
-import { ContentClient as ContentClient10 } from "@uniformdev/canvas";
+import { ContentClient as ContentClient11 } from "@uniformdev/canvas";
 var EntryPushModule = {
   command: "push <directory>",
   describe: "Pushes all entries from files in a directory to Uniform",
   builder: (yargs25) => withConfiguration(
     withApiOptions(
       withProjectOptions(
-        withDiffOptions(
-          yargs25.positional("directory", {
-            describe: "Directory to read the entries from. If a filename is used, a package will be read instead.",
-            type: "string"
-          }).option("what-if", {
-            alias: ["w"],
-            describe: "What-if mode reports what would be done but changes nothing",
-            default: false,
-            type: "boolean"
-          }).option("mode", {
-            alias: ["m"],
-            describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
-            choices: ["create", "createOrUpdate", "mirror"],
-            default: "mirror",
-            type: "string"
-          })
+        withStateOptions(
+          withDiffOptions(
+            yargs25.positional("directory", {
+              describe: "Directory to read the entries from. If a filename is used, a package will be read instead.",
+              type: "string"
+            }).option("what-if", {
+              alias: ["w"],
+              describe: "What-if mode reports what would be done but changes nothing",
+              default: false,
+              type: "boolean"
+            }).option("mode", {
+              alias: ["m"],
+              describe: 'What kind of changes can be made. "create" = create new, update nothing. "createOrUpdate" = create new, update existing, delete nothing. "mirror" = create, update, and delete',
+              choices: ["create", "createOrUpdate", "mirror"],
+              default: "mirror",
+              type: "string"
+            })
+          )
         )
       )
     )
@@ -2810,11 +2843,12 @@ var EntryPushModule = {
     directory,
     mode,
     whatIf,
+    state,
     project: projectId,
     diff: diffMode
   }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient10({
+    const client = new ContentClient11({
       apiKey,
       apiHost,
       fetch: fetch3,
@@ -2837,7 +2871,7 @@ var EntryPushModule = {
         selectDisplayName: selectEntryDisplayName
       });
     }
-    const target = createEntryEngineDataSource({ client });
+    const target = createEntryEngineDataSource({ client, state });
     await syncEngine({
       source,
       target,
@@ -2849,7 +2883,7 @@ var EntryPushModule = {
 };
 
 // src/commands/canvas/commands/entry/remove.ts
-import { ContentClient as ContentClient11 } from "@uniformdev/canvas";
+import { ContentClient as ContentClient12 } from "@uniformdev/canvas";
 var EntryRemoveModule = {
   command: "remove <id>",
   aliases: ["delete", "rm"],
@@ -2863,13 +2897,13 @@ var EntryRemoveModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, id, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient11({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = new ContentClient12({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
     await client.deleteEntry({ entryId: id });
   }
 };
 
 // src/commands/canvas/commands/entry/update.ts
-import { ContentClient as ContentClient12 } from "@uniformdev/canvas";
+import { ContentClient as ContentClient13 } from "@uniformdev/canvas";
 var EntryUpdateModule = {
   command: "update <filename>",
   aliases: ["put"],
@@ -2883,7 +2917,7 @@ var EntryUpdateModule = {
   ),
   handler: async ({ apiHost, apiKey, proxy, filename, project: projectId }) => {
     const fetch3 = nodeFetchProxy(proxy);
-    const client = new ContentClient12({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
+    const client = new ContentClient13({ apiKey, apiHost, fetch: fetch3, projectId, bypassCache: true });
     const file = readFileToObject(filename);
     await client.upsertEntry(file);
   }
@@ -4726,7 +4760,7 @@ import ora from "ora";
 var makeSpinner = () => {
   const spinners = [];
   const stopAllSpinners = () => spinners.forEach((spinner) => spinner.stop());
-  const spin = async (text) => {
+  const spin2 = async (text) => {
     const spinner = ora(text).start();
     spinners.push(spinner);
     const minWait = new Promise((resolve2) => setTimeout(resolve2, 500));
@@ -4735,7 +4769,7 @@ var makeSpinner = () => {
       spinner.stop();
     };
   };
-  return { stopAllSpinners, spin };
+  return { stopAllSpinners, spin: spin2 };
 };
 
 // src/telemetry/telemetry.ts
@@ -4745,7 +4779,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.49.1",
+  version: "19.56.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -4782,7 +4816,7 @@ var package_default = {
     "isomorphic-git": "1.24.5",
     "isomorphic-unfetch": "^3.1.0",
     "js-yaml": "^4.1.0",
-    jsonwebtoken: "9.0.1",
+    jsonwebtoken: "9.0.2",
     "lodash.isequalwith": "^4.4.0",
     open: "9.1.0",
     ora: "6.3.1",
@@ -4794,9 +4828,9 @@ var package_default = {
     zod: "3.21.4"
   },
   devDependencies: {
-    "@types/diff": "5.0.3",
+    "@types/diff": "5.0.4",
     "@types/inquirer": "9.0.3",
-    "@types/js-yaml": "4.0.5",
+    "@types/js-yaml": "4.0.6",
     "@types/jsonwebtoken": "9.0.2",
     "@types/lodash.isequalwith": "4.4.7",
     "@types/node": "18.17.6",
@@ -5132,12 +5166,12 @@ import * as http from "isomorphic-git/http/node/index.js";
 import os from "os";
 import path2 from "path";
 async function cloneStarter({
-  spin,
+  spin: spin2,
   githubPath,
   targetDir,
   dotEnvFile
 }) {
-  const done = await spin("Fetching starter code...");
+  const done = await spin2("Fetching starter code...");
   const cloneDir = path2.join(os.tmpdir(), `uniform-new-${crypto2.randomBytes(20).toString("hex")}`);
   const [user, repo, ...pathSegments] = githubPath.split("/");
   try {
@@ -5187,7 +5221,7 @@ async function getOrCreateProject({
   user,
   explicitName,
   client,
-  spin,
+  spin: spin2,
   checkTargetDir,
   explicitTargetDir,
   previewUrl,
@@ -5217,7 +5251,7 @@ async function getOrCreateProject({
       checkTargetDir,
       explicitTargetDir
     });
-    const projectId = await createProject({ client, projectName, spin, teamId, previewUrl });
+    const projectId = await createProject({ client, projectName, spin: spin2, teamId, previewUrl });
     telemetry.send("project created", { projectId, targetDir });
     return {
       projectId,
@@ -5258,11 +5292,11 @@ async function getNewProjectName({
 async function createProject({
   projectName,
   teamId,
-  spin,
+  spin: spin2,
   client,
   previewUrl
 }) {
-  const done = await spin("Creating your new project...");
+  const done = await spin2("Creating your new project...");
   const projectId = await client.createProject(teamId, projectName, previewUrl);
   await done();
   return projectId;
@@ -5391,11 +5425,11 @@ var getUserInfo = async (baseUrl, authToken, subject) => {
 async function fetchUserAndEnsureFirstTeamExists({
   baseUrl,
   auth: { authToken, decoded },
-  spin,
+  spin: spin2,
   telemetry
 }) {
   const uniformClient = createClient(baseUrl, authToken);
-  const done = await spin("Fetching user information...");
+  const done = await spin2("Fetching user information...");
   let user = await getUserInfo(baseUrl, authToken, decoded.sub);
   if (user.teams.length < 1) {
     await uniformClient.createTeam(`${user.name}'s team`);
@@ -5408,7 +5442,7 @@ async function fetchUserAndEnsureFirstTeamExists({
 
 // src/commands/new/commands/new.ts
 async function newHandler({
-  spin,
+  spin: spin2,
   projectName,
   apiHost,
   outputPath,
@@ -5420,7 +5454,7 @@ async function newHandler({
   const auth = await getBearerToken(apiHost);
   const { authToken } = auth;
   const uniformClient = createClient(apiHost, authToken);
-  const user = await fetchUserAndEnsureFirstTeamExists({ auth, baseUrl: apiHost, spin, telemetry });
+  const user = await fetchUserAndEnsureFirstTeamExists({ auth, baseUrl: apiHost, spin: spin2, telemetry });
   const { teamId } = await chooseTeam(
     user,
     `Hey ${user.name}! Choose a Uniform team for your new project`,
@@ -5519,7 +5553,7 @@ async function newHandler({
     client: uniformClient,
     createNew: true,
     chooseExisting: false,
-    spin,
+    spin: spin2,
     teamId,
     user,
     explicitName: projectName,
@@ -5528,7 +5562,7 @@ async function newHandler({
     previewUrl: serverUrl + previewPath,
     telemetry
   });
-  let done = await spin("Generating API keys...");
+  let done = await spin2("Generating API keys...");
   const { readApiKey, writeApiKey } = await uniformClient.createApiKeys(teamId, projectId);
   await done();
   const dotEnvFile = [
@@ -5546,7 +5580,7 @@ async function newHandler({
   if (githubUri.endsWith("commerce-starter")) {
     const stableFakecommerceId = "fakecommerce-d04dcf12-f811-401d-add8-1fb81cfdb8a5";
     const canaryFakecommerceId = "fakecommerce-f94cf199-7ea4-46ce-ae8b-825668bb79bc";
-    done = await spin("Installing Fake Commerce...");
+    done = await spin2("Installing Fake Commerce...");
     await uniformClient.installIntegration({
       projectId,
       type: apiHost.includes("canary") ? canaryFakecommerceId : stableFakecommerceId
@@ -5556,7 +5590,7 @@ async function newHandler({
   const cloneStartTimestamp = Date.now();
   const { runNpmInstall } = await cloneStarter({
     githubPath: githubUri,
-    spin,
+    spin: spin2,
     targetDir,
     dotEnvFile
   });
@@ -5564,7 +5598,7 @@ async function newHandler({
   const installStartTimestamp = Date.now();
   await runNpmInstall();
   telemetry.send("deps installed", { duration: Date.now() - installStartTimestamp });
-  done = await spin("Creating components and compositions");
+  done = await spin2("Creating components and compositions");
   await runNpm(targetDir, ["run", "uniform:push"]);
   await runNpm(targetDir, ["run", "uniform:publish"]);
   await done();
@@ -5599,7 +5633,7 @@ import inquirer5 from "inquirer";
 import path4 from "path";
 import slugify2 from "slugify";
 async function newMeshIntegrationHandler({
-  spin,
+  spin: spin2,
   apiHost,
   outputPath,
   telemetry
@@ -5608,7 +5642,7 @@ async function newMeshIntegrationHandler({
   const auth = await getBearerToken(apiHost);
   const { authToken } = auth;
   const uniformClient = createClient(apiHost, authToken);
-  const user = await fetchUserAndEnsureFirstTeamExists({ auth, baseUrl: apiHost, spin, telemetry });
+  const user = await fetchUserAndEnsureFirstTeamExists({ auth, baseUrl: apiHost, spin: spin2, telemetry });
   const { teamId } = await chooseTeam(
     user,
     `Hey ${user.name}! Choose a Uniform team to register your integration`,
@@ -5633,10 +5667,10 @@ async function newMeshIntegrationHandler({
   const { targetDir, typeSlug } = validateIntegrationName(answer.name, outputPath);
   const { runNpmInstall } = await cloneStarter({
     githubPath: `uniformdev/examples/examples/mesh-integration`,
-    spin,
+    spin: spin2,
     targetDir
   });
-  let done = await spin("Registering integration to team...");
+  let done = await spin2("Registering integration to team...");
   const pathToManifest = path4.resolve(targetDir, "mesh-manifest.json");
   if (!existsSync3(pathToManifest)) {
     throw new Error("Invalid integration starter cloned: missing `mesh-manifest.json`");
@@ -5658,13 +5692,13 @@ async function newMeshIntegrationHandler({
     client: uniformClient,
     createNew: true,
     chooseExisting: true,
-    spin,
+    spin: spin2,
     teamId,
     user,
     checkTargetDir: false,
     telemetry
   });
-  done = await spin("Installing integration to project...");
+  done = await spin2("Installing integration to project...");
   await uniformClient.installIntegration({ projectId, type: typeSlug });
   await done();
   console.log(`
@@ -5734,10 +5768,10 @@ var NewCmd = {
   ),
   describe: "Start a new Uniform project",
   handler: async function({ name, apiHost, outputPath, disableTelemetry }) {
-    const { stopAllSpinners, spin } = makeSpinner();
+    const { stopAllSpinners, spin: spin2 } = makeSpinner();
     const telemetry = new Telemetry("cli new", disableTelemetry || apiHost !== stableApiHost);
     try {
-      await newHandler({ spin, projectName: name, apiHost, outputPath, telemetry });
+      await newHandler({ spin: spin2, projectName: name, apiHost, outputPath, telemetry });
       stopAllSpinners();
       process.exit(0);
     } catch (err) {
@@ -5771,10 +5805,10 @@ var NewMeshCmd = {
   ),
   describe: "Start a new Uniform project",
   handler: async function({ apiHost, outputPath, disableTelemetry }) {
-    const { stopAllSpinners, spin } = makeSpinner();
+    const { stopAllSpinners, spin: spin2 } = makeSpinner();
     const telemetry = new Telemetry("cli new mesh", disableTelemetry || apiHost !== stableApiHost);
     try {
-      await newMeshIntegrationHandler({ spin, apiHost, outputPath, telemetry });
+      await newMeshIntegrationHandler({ spin: spin2, apiHost, outputPath, telemetry });
       stopAllSpinners();
       process.exit(0);
     } catch (err) {
@@ -6854,6 +6888,31 @@ var RedirectCommand = {
 // src/commands/sync/index.ts
 import yargs23 from "yargs";
 
+// src/commands/sync/commands/util.ts
+import ora2 from "ora";
+function spin(entityType) {
+  const spinner = ora2(entityType).start();
+  const consoleLog = console.log;
+  console.log = (...text) => {
+    if (text.length === 1 && typeof text[0] === "string") {
+      spinner.text += "\n" + text;
+    } else {
+      consoleLog(...text);
+    }
+  };
+  return {
+    ...spinner,
+    stop: () => {
+      spinner.stop();
+      console.log = consoleLog;
+    },
+    succeed() {
+      spinner.succeed();
+      console.log = consoleLog;
+    }
+  };
+}
+
 // src/commands/sync/commands/pull.ts
 var SyncPullModule = {
   command: "pull",
@@ -6887,7 +6946,9 @@ var SyncPullModule = {
       composition: CompositionPullModule,
       projectMapDefinition: ProjectMapDefinitionPullModule,
       projectMapNode: ProjectMapNodePullModule,
-      redirect: RedirectDefinitionPullModule
+      redirect: RedirectDefinitionPullModule,
+      entry: EntryPullModule,
+      contentType: ContentTypePullModule
     }).filter(([entityType]) => {
       var _a, _b, _c, _d, _e, _f;
       return Boolean((_a = config2.entitiesConfig) == null ? void 0 : _a[entityType]) && ((_c = (_b = config2.entitiesConfig) == null ? void 0 : _b[entityType]) == null ? void 0 : _c.disabled) !== true && ((_f = (_e = (_d = config2.entitiesConfig) == null ? void 0 : _d[entityType]) == null ? void 0 : _e.pull) == null ? void 0 : _f.disabled) !== true;
@@ -6898,15 +6959,22 @@ var SyncPullModule = {
       );
     }
     for (const [entityType, module3] of enabledEntities) {
-      await module3.handler({
-        ...otherParams,
-        state: 0,
-        format: getFormat(entityType, config2),
-        onlyCompositions: entityType === "composition" ? true : void 0,
-        onlyPatterns: entityType === "pattern" ? true : void 0,
-        mode: getPullMode(entityType, config2),
-        directory: getPullFilename(entityType, config2)
-      });
+      const spinner = spin(entityType);
+      try {
+        await module3.handler({
+          ...otherParams,
+          state: 0,
+          format: getFormat(entityType, config2),
+          onlyCompositions: entityType === "composition" ? true : void 0,
+          onlyPatterns: entityType === "pattern" ? true : void 0,
+          mode: getPullMode(entityType, config2),
+          directory: getPullFilename(entityType, config2)
+        });
+        spinner.succeed();
+      } catch (e) {
+        spinner.stop();
+        throw e;
+      }
     }
   }
 };
@@ -6968,7 +7036,9 @@ var SyncPushModule = {
       composition: CompositionPushModule,
       projectMapDefinition: ProjectMapDefinitionPushModule,
       projectMapNode: ProjectMapNodePushModule,
-      redirect: RedirectDefinitionPushModule
+      redirect: RedirectDefinitionPushModule,
+      contentType: ContentTypePushModule,
+      entry: EntryPushModule
     }).filter(([entityType]) => {
       var _a2, _b2, _c2, _d2, _e2, _f2;
       return Boolean((_a2 = config2.entitiesConfig) == null ? void 0 : _a2[entityType]) && ((_c2 = (_b2 = config2.entitiesConfig) == null ? void 0 : _b2[entityType]) == null ? void 0 : _c2.disabled) !== true && ((_f2 = (_e2 = (_d2 = config2.entitiesConfig) == null ? void 0 : _d2[entityType]) == null ? void 0 : _e2.push) == null ? void 0 : _f2.disabled) !== true;
@@ -6979,15 +7049,22 @@ var SyncPushModule = {
       );
     }
     for (const [entityType, module3] of enabledEntities) {
-      await module3.handler({
-        ...otherParams,
-        state: 0,
-        format: getFormat2(entityType, config2),
-        onlyCompositions: entityType === "composition" ? true : void 0,
-        onlyPatterns: entityType === "pattern" ? true : void 0,
-        mode: getPushMode(entityType, config2),
-        directory: getPushFilename(entityType, config2)
-      });
+      const spinner = spin(entityType);
+      try {
+        await module3.handler({
+          ...otherParams,
+          state: 0,
+          format: getFormat2(entityType, config2),
+          onlyCompositions: entityType === "composition" ? true : void 0,
+          onlyPatterns: entityType === "pattern" ? true : void 0,
+          mode: getPushMode(entityType, config2),
+          directory: getPushFilename(entityType, config2)
+        });
+        spinner.succeed();
+      } catch (e) {
+        spinner.stop();
+        throw e;
+      }
     }
     if (((_a = config2.entitiesConfig) == null ? void 0 : _a.pattern) && ((_d = (_c = (_b = config2.entitiesConfig) == null ? void 0 : _b.pattern) == null ? void 0 : _c.push) == null ? void 0 : _d.disabled) !== true && ((_f = (_e = config2.entitiesConfig) == null ? void 0 : _e.pattern) == null ? void 0 : _f.publish)) {
       await PatternPublishModule.handler({ ...otherParams, all: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.49.1",
+  "version": "19.49.4-alpha.67+9773e3b65",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -17,11 +17,11 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/canvas": "19.49.1",
-    "@uniformdev/context": "19.49.1",
-    "@uniformdev/files": "19.49.1",
-    "@uniformdev/project-map": "19.49.1",
-    "@uniformdev/redirect": "19.49.1",
+    "@uniformdev/canvas": "19.49.4-alpha.67+9773e3b65",
+    "@uniformdev/context": "19.49.4-alpha.67+9773e3b65",
+    "@uniformdev/files": "19.49.4-alpha.67+9773e3b65",
+    "@uniformdev/project-map": "19.49.4-alpha.67+9773e3b65",
+    "@uniformdev/redirect": "19.49.4-alpha.67+9773e3b65",
     "colorette": "2.0.20",
     "cosmiconfig": "8.2.0",
     "cosmiconfig-typescript-loader": "5.0.0",
@@ -37,7 +37,7 @@
     "isomorphic-git": "1.24.5",
     "isomorphic-unfetch": "^3.1.0",
     "js-yaml": "^4.1.0",
-    "jsonwebtoken": "9.0.1",
+    "jsonwebtoken": "9.0.2",
     "lodash.isequalwith": "^4.4.0",
     "open": "9.1.0",
     "ora": "6.3.1",
@@ -49,9 +49,9 @@
     "zod": "3.21.4"
   },
   "devDependencies": {
-    "@types/diff": "5.0.3",
+    "@types/diff": "5.0.4",
     "@types/inquirer": "9.0.3",
-    "@types/js-yaml": "4.0.5",
+    "@types/js-yaml": "4.0.6",
     "@types/jsonwebtoken": "9.0.2",
     "@types/lodash.isequalwith": "4.4.7",
     "@types/node": "18.17.6",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a14b97601fb78b44be7f0849841b9828dec0ea96"
+  "gitHead": "9773e3b65168255768f5cbecf2536988fa0e03af"
 }