@uniformdev/cli 19.9.2-alpha.3 → 19.11.0

package/dist/index.mjs

@@ -21,33 +21,34 @@ async function createArraySyncEngineDataSource({
   selectDisplayName: selectDisplayName12 = selectIdentifier12,
   onSyncComplete
 }) {
-  const objectIndex = objects.reduce((result, current) => {
-    const rawIdentifiers = selectIdentifier12(current);
-    const identifiers = Array.isArray(rawIdentifiers) ? rawIdentifiers : [rawIdentifiers];
-    while (identifiers.length > 0) {
-      const identifier = identifiers.pop();
-      if (!identifier)
-        continue;
-      if (result[identifier]) {
-        throw new Error(`Identifier ${identifier} was not unique.`);
+  const objectIndex = objects.reduce(
+    (result, current) => {
+      const rawIdentifiers = selectIdentifier12(current);
+      const identifiers = Array.isArray(rawIdentifiers) ? rawIdentifiers : [rawIdentifiers];
+      const existingResult = identifiers.find((id) => result[id]);
+      if (existingResult) {
+        throw new Error(`Identifier(s) ${identifiers} was not unique.`);
       }
       const displayName = selectDisplayName12(current);
-      result[identifier] = {
-        id: identifier,
+      result[identifiers[0]] = {
+        id: identifiers,
         object: current,
-        providerId: identifier,
+        providerId: identifiers[0],
         displayName: Array.isArray(displayName) ? displayName[0] : displayName
       };
-    }
-    return result;
-  }, {});
+      identifiers.slice(1).forEach((id) => result[id] = identifiers[0]);
+      return result;
+    },
+    {}
+  );
   async function* getObjects() {
     for (const item of Object.values(objectIndex)) {
-      yield item;
+      if (typeof item === "object")
+        yield item;
     }
   }
   function extractCurrent() {
-    return Object.entries(objectIndex).sort((a, b) => a[0].localeCompare(b[0])).map((entry) => entry[1].object);
+    return Object.entries(objectIndex).filter((entry) => typeof entry[1] === "object").sort((a, b) => a[0].localeCompare(b[0])).map((entry) => entry[1].object);
   }
   return {
     objects: getObjects(),
@@ -57,7 +58,7 @@ async function createArraySyncEngineDataSource({
     writeObject: async (objectToWrite) => {
       const id = selectIdentifier12(objectToWrite.object);
       if (Array.isArray(id)) {
-        id.forEach((i) => objectIndex[i] = objectToWrite);
+        objectIndex[id[0]] = objectToWrite;
       } else {
         objectIndex[id] = objectToWrite;
       }
@@ -81,6 +82,9 @@ var omit = (object, keys) => {
   }, object);
   return result;
 };
+var cleanFileName = (proposedFileName) => {
+  return proposedFileName.replace(/[/<>$+%>!`&*'|{}?"=:\\@]/g, "-");
+};
 
 // src/sync/util.ts
 import { readFileSync, writeFileSync } from "fs";
@@ -240,10 +244,11 @@ async function createFileSyncEngineDataSource({
     for (const filename of filenames) {
       const fullFilename = join(directory, filename);
       try {
-        const contents = await readFileToObject(fullFilename);
+        const contents = readFileToObject(fullFilename);
+        const displayName = selectDisplayName12(contents);
         const object = {
           id: selectIdentifier12(contents),
-          displayName: selectDisplayName12(contents)[0],
+          displayName: Array.isArray(displayName) ? displayName[0] : displayName,
           providerId: fullFilename,
           object: omit(contents, ["$schema"])
         };
@@ -300,7 +305,7 @@ async function syncEngine({
     return isEqualWith(
       source2.object,
       target2.object,
-      (_a, _b, key) => key === "created" || key === "modified" ? true : void 0
+      (_a, _b, key) => key === "created" || key === "modified" || key === "updated" ? true : void 0
     );
   },
   mode,
@@ -346,7 +351,7 @@ async function syncEngine({
     sourceHasItems = true;
     const ids = Array.isArray(sourceObject.id) ? sourceObject.id : [sourceObject.id];
     const targetObject = targetItems.get(ids[0]);
-    const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter((o) => o !== targetObject);
+    const invalidTargetObjects = ids.map((i) => targetItems.get(i)).filter((o) => (o == null ? void 0 : o.object) !== (targetObject == null ? void 0 : targetObject.object));
     if (targetObject && invalidTargetObjects.length == 0) {
       if (!compareContents(sourceObject, targetObject)) {
         if (mode === "createOrUpdate" || mode === "mirror") {
@@ -390,12 +395,10 @@ async function syncEngine({
         });
       };
       if (invalidTargetObjects.length > 0) {
-        [...invalidTargetObjects, targetObject].forEach(
-          (o) => {
-            var _a2;
-            return (_a2 = o == null ? void 0 : o.id) == null ? void 0 : _a2.forEach((i) => targetItems.delete(i));
-          }
-        );
+        [...invalidTargetObjects, targetObject].forEach((o) => {
+          var _a2;
+          (_a2 = Array.isArray(o == null ? void 0 : o.id) ? o == null ? void 0 : o.id : [o == null ? void 0 : o.id]) == null ? void 0 : _a2.forEach((i) => i && targetItems.delete(i));
+        });
         const deletes = invalidTargetObjects.filter((io) => typeof io !== "undefined").map(async (io) => {
           await processDelete(io);
         });
@@ -3099,7 +3102,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.9.1",
+  version: "19.11.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -3127,7 +3130,7 @@ var package_default = {
     graphql: "16.6.0",
     "graphql-request": "6.0.0",
     "https-proxy-agent": "^5.0.1",
-    inquirer: "9.2.1",
+    inquirer: "9.2.3",
     "isomorphic-git": "1.21.0",
     "isomorphic-unfetch": "^3.1.0",
     "js-yaml": "^4.1.0",
@@ -3146,7 +3149,7 @@ var package_default = {
     "@types/js-yaml": "4.0.5",
     "@types/jsonwebtoken": "9.0.2",
     "@types/lodash.isequalwith": "4.4.7",
-    "@types/node": "18.16.8",
+    "@types/node": "18.16.9",
     "@types/yargs": "17.0.24"
   },
   bin: {
@@ -3675,7 +3678,7 @@ var query = gql`
     info: identities_by_pk(subject: $subject) {
       name
       email_address
-      teams: organizations_identities {
+      teams: organizations_identities(order_by: { organization: { name: asc } }) {
         team: organization {
           name
           id
@@ -4598,7 +4601,7 @@ var selectIdentifier10 = (source, projectId) => [
   projectId + source.projectMapId + source.id,
   projectId + source.projectMapId + source.path
 ];
-var selectFilename = (source) => `${source.pathSegment}_${source.id}`;
+var selectFilename = (source) => cleanFileName(`${source.pathSegment}_${source.id}`);
 var selectDisplayName10 = (source) => `${source.name} (pid: ${source.id})`;
 
 // src/commands/project-map/ProjectMapNodeEngineDataSource.ts
@@ -4912,7 +4915,7 @@ function writeContextPackage3(filename, packageContents) {
 var selectIdentifier11 = (source) => source.redirect.id;
 var selectFilename2 = (source) => {
   const index = source.redirect.sourceUrl.lastIndexOf("/");
-  return source.redirect.sourceUrl.substring(index + 1).replace(/[/<>$+%>!`&*'|{}?"=:\\@]/g, "-") + `_${source.redirect.id}`;
+  return cleanFileName(source.redirect.sourceUrl.substring(index + 1)) + `_${source.redirect.id}`;
 };
 var selectDisplayName11 = (source) => {
   let pathName = source.redirect.sourceUrl;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.9.2-alpha.3+547c8b11d",
+  "version": "19.11.0",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -16,10 +16,10 @@
     "format": "prettier --write \"src/**/*.{js,ts,tsx}\""
   },
   "dependencies": {
-    "@uniformdev/canvas": "19.9.2-alpha.3+547c8b11d",
-    "@uniformdev/context": "19.9.2-alpha.3+547c8b11d",
-    "@uniformdev/project-map": "19.9.2-alpha.3+547c8b11d",
-    "@uniformdev/redirect": "19.9.2-alpha.3+547c8b11d",
+    "@uniformdev/canvas": "19.11.0",
+    "@uniformdev/context": "19.11.0",
+    "@uniformdev/project-map": "19.11.0",
+    "@uniformdev/redirect": "19.11.0",
     "ansi-colors": "^4.1.3",
     "diff": "^5.0.0",
     "dotenv": "^16.0.3",
@@ -28,7 +28,7 @@
     "graphql": "16.6.0",
     "graphql-request": "6.0.0",
     "https-proxy-agent": "^5.0.1",
-    "inquirer": "9.2.1",
+    "inquirer": "9.2.3",
     "isomorphic-git": "1.21.0",
     "isomorphic-unfetch": "^3.1.0",
     "js-yaml": "^4.1.0",
@@ -47,7 +47,7 @@
     "@types/js-yaml": "4.0.5",
     "@types/jsonwebtoken": "9.0.2",
     "@types/lodash.isequalwith": "4.4.7",
-    "@types/node": "18.16.8",
+    "@types/node": "18.16.9",
     "@types/yargs": "17.0.24"
   },
   "bin": {
@@ -59,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "547c8b11d4655b34250c2fbe3f016c9bc12c3905"
+  "gitHead": "25d492fe923f313b517cbc70d3ff13fdcf97fa34"
 }