@uniformdev/cli 20.53.1-alpha.7 → 20.53.2-alpha.0

package/dist/index.mjs

@@ -722,7 +722,7 @@ import mitt from "mitt";
 
 // src/sync/serializedDequal.ts
 var has = Object.prototype.hasOwnProperty;
-var ignoredProperties = /* @__PURE__ */ new Set(["created", "modified", "updated"]);
+var ignoredProperties = /* @__PURE__ */ new Set(["created", "modified", "updated", "createdBy", "modifiedBy", "updatedBy"]);
 function serializedDequal(foo, bar) {
   let ctor, len;
   if (foo === bar) {
@@ -1107,7 +1107,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "20.53.0",
+  version: "20.53.1",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -2459,7 +2459,7 @@ import {
   walkNodeTree,
   walkPropertyValues
 } from "@uniformdev/canvas";
-var UNIFORM_FILE_MATCH = /"(https:\/\/([^"]*?)?(img|files)\.(eu\.)?uniform\.(rocks|global)\/([^"]*?))"/g;
+var UNIFORM_FILE_MATCH = /"(https:\/\/([^"]*?)?(img|files)\.(eu([1-9]\d*)?\.)?uniform\.(rocks|global)\/([^"]*?))"/g;
 var walkFileUrlsForCompositionOrEntry = ({
   entity,
   callback
@@ -2742,7 +2742,7 @@ var escapeRegExp = (string4) => {
 var findUrlMatchingPartialPathname = (source, pathname) => {
   const escapedPathname = escapeRegExp(pathname);
   const regex = new RegExp(
-    `"(https://([^"]*?)?(img|files).uniform.(rocks|global)${escapedPathname}([^"]*?))"`
+    `"(https://([^"]*?)?(img|files).(eu([1-9]\\d*)?\\.)?uniform.(rocks|global)${escapedPathname}([^"]*?))"`
   );
   const match = source.match(regex);
   if (match && match[1]) {
@@ -7090,17 +7090,24 @@ function getLabelClient(options) {
 }
 
 // src/commands/canvas/labelsEngineDataSource.ts
+function normalizeLabelForSync(label) {
+  const { projectId: _projectId, ...labelWithoutProjectId } = label;
+  return labelWithoutProjectId;
+}
 function createLabelsEngineDataSource({
   client
 }) {
   async function* getObjects() {
-    const labels = (await client.getLabels()).labels;
+    const labels = paginateAsync(
+      async (offset, limit2) => (await client.getLabels({ offset, limit: limit2 })).labels,
+      { pageSize: 100 }
+    );
     for await (const label of labels) {
       const result = {
         id: label.label.publicId,
         displayName: `${label.label.displayName} (pid: ${label.label.publicId})`,
         providerId: label.label.publicId,
-        object: label
+        object: normalizeLabelForSync(label)
       };
       yield result;
     }
@@ -7204,6 +7211,7 @@ var LabelPullModule = {
 };
 
 // src/commands/canvas/commands/label/push.ts
+var __INTERNAL_MISSING_PARENT_LABEL_ERROR = "Parent label with public ID";
 var LabelPushModule = {
   command: "push <directory>",
   describe: "Pushes all labels from files in a directory to Uniform",
@@ -7261,14 +7269,41 @@ var LabelPushModule = {
       });
     }
     const target = createLabelsEngineDataSource({ client });
-    await syncEngine({
-      source,
-      target,
-      mode,
-      whatIf,
-      allowEmptySource,
-      log: createSyncEngineConsoleLogger({ diffMode })
-    });
+    const labelsFailedDueToMissingParent = /* @__PURE__ */ new Set();
+    const attemptSync = async () => {
+      const lastFailedLabelsCount = labelsFailedDueToMissingParent.size;
+      labelsFailedDueToMissingParent.clear();
+      await syncEngine({
+        source,
+        target,
+        mode,
+        whatIf,
+        allowEmptySource,
+        log: createSyncEngineConsoleLogger({ diffMode }),
+        onError: (error, object4) => {
+          if (error.message.includes(__INTERNAL_MISSING_PARENT_LABEL_ERROR)) {
+            labelsFailedDueToMissingParent.add(object4.object);
+          } else {
+            throw error;
+          }
+        }
+      });
+      if (labelsFailedDueToMissingParent.size !== 0) {
+        const newFailedLabelsCount = labelsFailedDueToMissingParent.size;
+        if (newFailedLabelsCount !== lastFailedLabelsCount) {
+          source = await createArraySyncEngineDataSource({
+            name: `Labels re-push from ${directory}`,
+            objects: Array.from(labelsFailedDueToMissingParent),
+            selectIdentifier: selectLabelIdentifier,
+            selectDisplayName: selectLabelDisplayName
+          });
+          await attemptSync();
+        } else {
+          throw new Error("Failed to push labels due to missing parent labels");
+        }
+      }
+    };
+    await attemptSync();
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.53.1-alpha.7+1c3bd56284",
+  "version": "20.53.2-alpha.0+9f6b2ac29f",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -28,13 +28,13 @@
   "dependencies": {
     "@inquirer/prompts": "^7.10.1",
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.53.1-alpha.7+1c3bd56284",
-    "@uniformdev/canvas": "20.53.1-alpha.7+1c3bd56284",
-    "@uniformdev/context": "20.53.1-alpha.7+1c3bd56284",
-    "@uniformdev/files": "20.53.1-alpha.7+1c3bd56284",
-    "@uniformdev/project-map": "20.53.1-alpha.7+1c3bd56284",
-    "@uniformdev/redirect": "20.53.1-alpha.7+1c3bd56284",
-    "@uniformdev/richtext": "20.53.1-alpha.7+1c3bd56284",
+    "@uniformdev/assets": "20.53.2-alpha.0+9f6b2ac29f",
+    "@uniformdev/canvas": "20.53.2-alpha.0+9f6b2ac29f",
+    "@uniformdev/context": "20.53.2-alpha.0+9f6b2ac29f",
+    "@uniformdev/files": "20.53.2-alpha.0+9f6b2ac29f",
+    "@uniformdev/project-map": "20.53.2-alpha.0+9f6b2ac29f",
+    "@uniformdev/redirect": "20.53.2-alpha.0+9f6b2ac29f",
+    "@uniformdev/richtext": "20.53.2-alpha.0+9f6b2ac29f",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1c3bd56284db96f16318a18e62b3b6e83cb09f9b"
+  "gitHead": "9f6b2ac29f8ee91c8fe96e927eba23e4ed0dfee9"
 }