@uniformdev/cli 19.214.1-alpha.34 → 19.214.1-alpha.35

package/dist/index.mjs

@@ -2495,7 +2495,8 @@ var CompositionPublishModule = {
     onlyCompositions,
     onlyPatterns,
     patternType,
-    verbose
+    verbose,
+    directory
   }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or composition ID(s) to publish.`);
@@ -2522,6 +2523,7 @@ var CompositionPublishModule = {
       patternType,
       verbose
     });
+    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     await syncEngine({
       source,
       target,
@@ -2529,7 +2531,21 @@ var CompositionPublishModule = {
       mode: "createOrUpdate",
       whatIf,
       verbose,
-      log: createPublishStatusSyncEngineConsoleLogger({ status: "publish" })
+      log: createPublishStatusSyncEngineConsoleLogger({ status: "publish" }),
+      onBeforeCompareObjects: async (sourceObject) => {
+        return replaceLocalUrlsWithRemoteReferences({
+          entity: sourceObject,
+          fileClient
+        });
+      },
+      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+      onBeforeWriteObject: async (sourceObject) => {
+        return uploadFilesForCompositionOrEntry({
+          entity: sourceObject,
+          directory,
+          fileClient
+        });
+      }
     });
   }
 };
@@ -4320,7 +4336,18 @@ var EntryPublishModule = {
       )
     )
   ),
-  handler: async ({ apiHost, edgeApiHost, apiKey, proxy, ids, all, project: projectId, whatIf, verbose }) => {
+  handler: async ({
+    apiHost,
+    edgeApiHost,
+    apiKey,
+    proxy,
+    ids,
+    all,
+    project: projectId,
+    whatIf,
+    verbose,
+    directory
+  }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or entry ID(s) to publish.`);
       process.exit(1);
@@ -4340,13 +4367,28 @@ var EntryPublishModule = {
       entryIDs: entryIDsArray,
       onlyEntries: true
     });
+    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     await syncEngine({
       source,
       target,
       // Publishing is one-direction operation, so no need to support automatic un-publishing
       mode: "createOrUpdate",
       whatIf,
-      log: createPublishStatusSyncEngineConsoleLogger({ status: "publish" })
+      log: createPublishStatusSyncEngineConsoleLogger({ status: "publish" }),
+      onBeforeCompareObjects: async (sourceObject) => {
+        return replaceLocalUrlsWithRemoteReferences({
+          entity: sourceObject,
+          fileClient
+        });
+      },
+      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+      onBeforeWriteObject: async (sourceObject) => {
+        return uploadFilesForCompositionOrEntry({
+          entity: sourceObject,
+          directory,
+          fileClient
+        });
+      }
     });
   }
 };
@@ -4798,7 +4840,18 @@ var EntryPatternPublishModule = {
       )
     )
   ),
-  handler: async ({ apiHost, edgeApiHost, apiKey, proxy, ids, all, whatIf, project: projectId, verbose }) => {
+  handler: async ({
+    apiHost,
+    edgeApiHost,
+    apiKey,
+    proxy,
+    ids,
+    all,
+    whatIf,
+    project: projectId,
+    verbose,
+    directory
+  }) => {
     if (!all && !ids || all && ids) {
       console.error(`Specify --all or entry pattern ID(s) to publish.`);
       process.exit(1);
@@ -4818,13 +4871,28 @@ var EntryPatternPublishModule = {
       entryIDs: entryIDsArray,
       onlyPatterns: true
     });
+    const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
     await syncEngine({
       source,
       target,
       // Publishing is one-direction operation, so no need to support automatic un-publishing
       mode: "createOrUpdate",
       whatIf,
-      log: createPublishStatusSyncEngineConsoleLogger({ status: "publish" })
+      log: createPublishStatusSyncEngineConsoleLogger({ status: "publish" }),
+      onBeforeCompareObjects: async (sourceObject) => {
+        return replaceLocalUrlsWithRemoteReferences({
+          entity: sourceObject,
+          fileClient
+        });
+      },
+      compareContents: compareCompositionsOrEntriesWithoutAssetUrls,
+      onBeforeWriteObject: async (sourceObject) => {
+        return uploadFilesForCompositionOrEntry({
+          entity: sourceObject,
+          directory,
+          fileClient
+        });
+      }
     });
   }
 };
@@ -10645,7 +10713,8 @@ var SyncPushModule = {
             ...otherParams,
             patternType: "component",
             onlyPatterns: true,
-            all: true
+            all: true,
+            directory: getPushFilename("componentPattern", config2)
           }),
           {
             text: "publishing component patterns...",
@@ -10668,7 +10737,8 @@ var SyncPushModule = {
             ...otherParams,
             all: true,
             onlyPatterns: true,
-            patternType: "composition"
+            patternType: "composition",
+            directory: getPushFilename("compositionPattern", config2)
           }),
           {
             text: "publishing composition patterns...",
@@ -10690,7 +10760,8 @@ var SyncPushModule = {
           CompositionPublishModule.handler({
             ...otherParams,
             all: true,
-            onlyCompositions: true
+            onlyCompositions: true,
+            directory: getPushFilename("composition", config2)
           }),
           {
             text: "publishing compositions...",
@@ -10708,30 +10779,44 @@ var SyncPushModule = {
     }
     if (config2.entitiesConfig?.entry && config2.entitiesConfig?.entry?.push?.disabled !== true && config2.entitiesConfig?.entry?.publish) {
       try {
-        await spinPromise(EntryPublishModule.handler({ ...otherParams, all: true }), {
-          text: "publishing entries...",
-          successText: "published entries",
-          failText(error) {
-            return `publishing entries
+        await spinPromise(
+          EntryPublishModule.handler({
+            ...otherParams,
+            all: true,
+            directory: getPushFilename("entry", config2)
+          }),
+          {
+            text: "publishing entries...",
+            successText: "published entries",
+            failText(error) {
+              return `publishing entries
 
  ${error.stack ?? error.message}`;
+            }
           }
-        });
+        );
       } catch {
         process.exit(1);
       }
     }
     if (config2.entitiesConfig?.entryPattern && config2.entitiesConfig?.entryPattern?.push?.disabled !== true && config2.entitiesConfig?.entryPattern?.publish) {
       try {
-        await spinPromise(EntryPatternPublishModule.handler({ ...otherParams, all: true }), {
-          text: "publishing entry patterns...",
-          successText: "published entry patterns",
-          failText(error) {
-            return `publishing entry patterns
+        await spinPromise(
+          EntryPatternPublishModule.handler({
+            ...otherParams,
+            all: true,
+            directory: getPushFilename("entryPattern", config2)
+          }),
+          {
+            text: "publishing entry patterns...",
+            successText: "published entry patterns",
+            failText(error) {
+              return `publishing entry patterns
 
  ${error.stack ?? error.message}`;
+            }
           }
-        });
+        );
       } catch {
         process.exit(1);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.214.1-alpha.34+476b7be79b",
+  "version": "19.214.1-alpha.35+6fc698bf99",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,13 +27,13 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "19.214.1-alpha.34+476b7be79b",
-    "@uniformdev/canvas": "19.214.1-alpha.34+476b7be79b",
-    "@uniformdev/context": "19.214.1-alpha.34+476b7be79b",
-    "@uniformdev/files": "19.214.1-alpha.34+476b7be79b",
-    "@uniformdev/project-map": "19.214.1-alpha.34+476b7be79b",
-    "@uniformdev/redirect": "19.214.1-alpha.34+476b7be79b",
-    "@uniformdev/richtext": "19.214.1-alpha.34+476b7be79b",
+    "@uniformdev/assets": "19.214.1-alpha.35+6fc698bf99",
+    "@uniformdev/canvas": "19.214.1-alpha.35+6fc698bf99",
+    "@uniformdev/context": "19.214.1-alpha.35+6fc698bf99",
+    "@uniformdev/files": "19.214.1-alpha.35+6fc698bf99",
+    "@uniformdev/project-map": "19.214.1-alpha.35+6fc698bf99",
+    "@uniformdev/redirect": "19.214.1-alpha.35+6fc698bf99",
+    "@uniformdev/richtext": "19.214.1-alpha.35+6fc698bf99",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "476b7be79b950e65641ffb8698a13bc5d9b966f8"
+  "gitHead": "6fc698bf99ac7e8387e41b522af3582d0c8ab57e"
 }