@uniformdev/cli 20.49.5-alpha.10 → 20.49.5-alpha.11

package/dist/defaultConfig.d.mts

@@ -1,4 +1,4 @@
-import { C as CLIConfiguration, E as EntityTypes } from './index-ZI3elAaF.mjs';
+import { C as CLIConfiguration, E as EntityTypes } from './index-fzc0-h1F.mjs';
 
 type UniformConfigAllOptions = {
     /**

package/dist/{index-ZI3elAaF.d.mts → index-fzc0-h1F.d.mts}

@@ -6,12 +6,27 @@ type StateArgs = {
 type SyncMode = 'mirror' | 'createOrUpdate' | 'create';
 type EntityTypes = 'aggregate' | 'asset' | 'category' | 'workflow' | 'webhook' | 'component' | 'composition' | 'contentType' | 'dataType' | 'enrichment' | 'entry' | 'entryPattern' | 'locale' | 'componentPattern' | 'compositionPattern' | 'policyDocument' | 'projectMapDefinition' | 'projectMapNode' | 'previewUrl' | 'previewViewport' | 'prompt' | 'quirk' | 'redirect' | 'signal' | 'test';
 type SyncFileFormat = 'yaml' | 'json';
-type EntityConfiguration = {
+type EntityConfigurationBase = {
     mode?: SyncMode;
     directory?: string;
     format?: SyncFileFormat;
     disabled?: true;
 };
+type EntityFilterInclude = {
+    /** If set, only entities whose ID matches one of these values will be synced. Cannot be combined with `exclude`. */
+    include: string[];
+    exclude?: never;
+};
+type EntityFilterExclude = {
+    include?: never;
+    /** If set, entities whose ID matches one of these values will be excluded from sync. Cannot be combined with `include`. */
+    exclude: string[];
+};
+type EntityFilterNone = {
+    include?: never;
+    exclude?: never;
+};
+type EntityConfiguration = EntityConfigurationBase & (EntityFilterInclude | EntityFilterExclude | EntityFilterNone);
 type EntityWithStateConfiguration = EntityConfiguration & Partial<StateArgs>;
 type PublishableEntitiesConfiguration = EntityWithStateConfiguration & {
     publish?: boolean;

package/dist/index.d.mts

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-export { C as CLIConfiguration } from './index-ZI3elAaF.mjs';
+export { C as CLIConfiguration } from './index-fzc0-h1F.mjs';

package/dist/index.mjs

@@ -558,6 +558,34 @@ async function createArraySyncEngineDataSource({
   };
 }
 
+// src/sync/entityFilter.ts
+function resolveEntityFilter(entityConfig, operation) {
+  const directional = entityConfig?.[operation];
+  const include = directional?.include ?? entityConfig?.include;
+  const exclude = directional?.exclude ?? entityConfig?.exclude;
+  return createEntityFilter(include, exclude);
+}
+function createEntityFilter(include, exclude) {
+  if (include?.length && exclude?.length) {
+    throw new Error("Entity filter cannot have both `include` and `exclude` defined. Use one or the other.");
+  }
+  if (!include?.length && !exclude?.length) {
+    return void 0;
+  }
+  if (include?.length) {
+    const includeSet = new Set(include);
+    return (obj) => {
+      const ids = Array.isArray(obj.id) ? obj.id : [obj.id];
+      return ids.some((id) => includeSet.has(id));
+    };
+  }
+  const excludeSet = new Set(exclude);
+  return (obj) => {
+    const ids = Array.isArray(obj.id) ? obj.id : [obj.id];
+    return !ids.some((id) => excludeSet.has(id));
+  };
+}
+
 // src/sync/fileSyncEngineDataSource.ts
 import { red } from "colorette";
 import { existsSync as existsSync2, mkdirSync as mkdirSync2 } from "fs";
@@ -656,9 +684,13 @@ async function createFileSyncEngineDataSource({
       const fullFilename = join(directory, filename);
       try {
         const contents = readFileToObject(fullFilename);
+        const id = selectIdentifier18(contents);
+        if (id === void 0 || id === null || Array.isArray(id) && id.length === 0) {
+          throw new Error(`File does not contain a valid identifier.`);
+        }
         const displayName = selectDisplayName18(contents);
         const object4 = {
-          id: selectIdentifier18(contents),
+          id,
           displayName: Array.isArray(displayName) ? displayName[0] : displayName,
           providerId: fullFilename,
           object: omit(contents, ["$schema"])
@@ -773,6 +805,16 @@ function serializedDequal(foo, bar) {
 
 // src/sync/syncEngine.ts
 var syncEngineEvents = mitt();
+var _syncObjectFilter;
+async function withSyncEngineFilter(filter, fn) {
+  const prev = _syncObjectFilter;
+  _syncObjectFilter = filter;
+  try {
+    return await fn();
+  } finally {
+    _syncObjectFilter = prev;
+  }
+}
 async function syncEngine({
   source,
   target,
@@ -789,8 +831,10 @@ async function syncEngine({
   //verbose = false,
 }) {
   const status = new ReactiveStatusUpdate((status2) => syncEngineEvents.emit("statusUpdate", status2));
+  const objectFilter = _syncObjectFilter;
   const targetItems = /* @__PURE__ */ new Map();
   const deleteTracker = /* @__PURE__ */ new Set();
+  const getFirstId = (id) => Array.isArray(id) ? id[0] : id;
   const processDelete = async (object4) => {
     if (deleteTracker.has(object4)) return;
     deleteTracker.add(object4);
@@ -808,7 +852,7 @@ async function syncEngine({
     } finally {
       log2({
         action: "delete",
-        id: object4.id[0],
+        id: getFirstId(object4.id),
         providerId: object4.providerId,
         displayName: object4.displayName ?? object4.providerId,
         whatIf,
@@ -817,6 +861,9 @@ async function syncEngine({
     }
   };
   for await (const obj of target.objects) {
+    if (objectFilter && !objectFilter(obj)) {
+      continue;
+    }
     status.fetched++;
     if (Array.isArray(obj.id)) {
       obj.id.forEach((o) => targetItems.set(o, obj));
@@ -827,6 +874,9 @@ async function syncEngine({
   const actions = [];
   let sourceHasItems = false;
   for await (let sourceObject of source.objects) {
+    if (objectFilter && !objectFilter(sourceObject)) {
+      continue;
+    }
     sourceHasItems = true;
     if (onBeforeProcessObject) {
       await onBeforeProcessObject(sourceObject);
@@ -12704,19 +12754,23 @@ var SyncPullModule = {
         return entityConfig2 !== void 0 && "state" in entityConfig2;
       };
       const entityConfig = config2.entitiesConfig?.[entityType];
+      const entityFilter = resolveEntityFilter(entityConfig, "pull");
       try {
         await spinPromise(
-          module.handler({
-            ...otherParams,
-            state: entityConfigSupportsPullState(entityConfig) ? entityConfig.state ?? 0 : 0,
-            format: getFormat(entityType, config2),
-            onlyCompositions: entityType === "composition" ? true : void 0,
-            onlyPatterns: ["pattern", "componentPattern", "compositionPattern"].includes(entityType) ? true : void 0,
-            patternType: entityType === "compositionPattern" ? "composition" : entityType === "componentPattern" ? "component" : void 0,
-            mode: getPullMode(entityType, config2),
-            directory: getPullFilename(entityType, config2),
-            allowEmptySource: config2.allowEmptySource
-          }),
+          withSyncEngineFilter(
+            entityFilter,
+            () => module.handler({
+              ...otherParams,
+              state: entityConfigSupportsPullState(entityConfig) ? entityConfig.state ?? 0 : 0,
+              format: getFormat(entityType, config2),
+              onlyCompositions: entityType === "composition" ? true : void 0,
+              onlyPatterns: ["pattern", "componentPattern", "compositionPattern"].includes(entityType) ? true : void 0,
+              patternType: entityType === "compositionPattern" ? "composition" : entityType === "componentPattern" ? "component" : void 0,
+              mode: getPullMode(entityType, config2),
+              directory: getPullFilename(entityType, config2),
+              allowEmptySource: config2.allowEmptySource
+            })
+          ),
           {
             text: `${entityType}\u2026`,
             successText: entityType,
@@ -12868,19 +12922,24 @@ var SyncPushModule = {
       );
     }
     for (const [entityType, module] of enabledEntities) {
+      const entityConfig = config2.entitiesConfig?.[entityType];
+      const entityFilter = resolveEntityFilter(entityConfig, "push");
       try {
         await spinPromise(
-          module.handler({
-            ...otherParams,
-            state: 0,
-            format: getFormat2(entityType, config2),
-            onlyCompositions: entityType === "composition" ? true : void 0,
-            onlyPatterns: ["pattern", "componentPattern", "compositionPattern"].includes(entityType) ? true : void 0,
-            patternType: entityType === "compositionPattern" ? "composition" : entityType === "componentPattern" ? "component" : void 0,
-            mode: getPushMode(entityType, config2),
-            directory: getPushFilename(entityType, config2),
-            allowEmptySource: config2.allowEmptySource
-          }),
+          withSyncEngineFilter(
+            entityFilter,
+            () => module.handler({
+              ...otherParams,
+              state: 0,
+              format: getFormat2(entityType, config2),
+              onlyCompositions: entityType === "composition" ? true : void 0,
+              onlyPatterns: ["pattern", "componentPattern", "compositionPattern"].includes(entityType) ? true : void 0,
+              patternType: entityType === "compositionPattern" ? "composition" : entityType === "componentPattern" ? "component" : void 0,
+              mode: getPushMode(entityType, config2),
+              directory: getPushFilename(entityType, config2),
+              allowEmptySource: config2.allowEmptySource
+            })
+          ),
           {
             text: `${entityType}...`,
             successText: entityType,
@@ -12896,15 +12955,19 @@ var SyncPushModule = {
       }
     }
     if (config2.entitiesConfig?.componentPattern && config2.entitiesConfig?.componentPattern?.push?.disabled !== true && config2.entitiesConfig?.componentPattern?.publish) {
+      const publishFilter = resolveEntityFilter(config2.entitiesConfig.componentPattern, "push");
       try {
         await spinPromise(
-          ComponentPatternPublishModule.handler({
-            ...otherParams,
-            patternType: "component",
-            onlyPatterns: true,
-            all: true,
-            directory: getPushFilename("componentPattern", config2)
-          }),
+          withSyncEngineFilter(
+            publishFilter,
+            () => ComponentPatternPublishModule.handler({
+              ...otherParams,
+              patternType: "component",
+              onlyPatterns: true,
+              all: true,
+              directory: getPushFilename("componentPattern", config2)
+            })
+          ),
           {
             text: "publishing component patterns...",
             successText: "published component patterns",
@@ -12920,15 +12983,19 @@ var SyncPushModule = {
       }
     }
     if (config2.entitiesConfig?.compositionPattern && config2.entitiesConfig?.compositionPattern?.push?.disabled !== true && config2.entitiesConfig?.compositionPattern?.publish) {
+      const publishFilter = resolveEntityFilter(config2.entitiesConfig.compositionPattern, "push");
       try {
         await spinPromise(
-          CompositionPatternPublishModule.handler({
-            ...otherParams,
-            all: true,
-            onlyPatterns: true,
-            patternType: "composition",
-            directory: getPushFilename("compositionPattern", config2)
-          }),
+          withSyncEngineFilter(
+            publishFilter,
+            () => CompositionPatternPublishModule.handler({
+              ...otherParams,
+              all: true,
+              onlyPatterns: true,
+              patternType: "composition",
+              directory: getPushFilename("compositionPattern", config2)
+            })
+          ),
           {
             text: "publishing composition patterns...",
             successText: "published composition patterns",
@@ -12944,14 +13011,18 @@ var SyncPushModule = {
       }
     }
     if (config2.entitiesConfig?.composition && config2.entitiesConfig?.composition?.push?.disabled !== true && config2.entitiesConfig?.composition?.publish) {
+      const publishFilter = resolveEntityFilter(config2.entitiesConfig.composition, "push");
       try {
         await spinPromise(
-          CompositionPublishModule.handler({
-            ...otherParams,
-            all: true,
-            onlyCompositions: true,
-            directory: getPushFilename("composition", config2)
-          }),
+          withSyncEngineFilter(
+            publishFilter,
+            () => CompositionPublishModule.handler({
+              ...otherParams,
+              all: true,
+              onlyCompositions: true,
+              directory: getPushFilename("composition", config2)
+            })
+          ),
           {
             text: "publishing compositions...",
             successText: "published compositions",
@@ -12967,13 +13038,17 @@ var SyncPushModule = {
       }
     }
     if (config2.entitiesConfig?.entry && config2.entitiesConfig?.entry?.push?.disabled !== true && config2.entitiesConfig?.entry?.publish) {
+      const publishFilter = resolveEntityFilter(config2.entitiesConfig.entry, "push");
       try {
         await spinPromise(
-          EntryPublishModule.handler({
-            ...otherParams,
-            all: true,
-            directory: getPushFilename("entry", config2)
-          }),
+          withSyncEngineFilter(
+            publishFilter,
+            () => EntryPublishModule.handler({
+              ...otherParams,
+              all: true,
+              directory: getPushFilename("entry", config2)
+            })
+          ),
           {
             text: "publishing entries...",
             successText: "published entries",
@@ -12989,13 +13064,17 @@ var SyncPushModule = {
       }
     }
     if (config2.entitiesConfig?.entryPattern && config2.entitiesConfig?.entryPattern?.push?.disabled !== true && config2.entitiesConfig?.entryPattern?.publish) {
+      const publishFilter = resolveEntityFilter(config2.entitiesConfig.entryPattern, "push");
       try {
         await spinPromise(
-          EntryPatternPublishModule.handler({
-            ...otherParams,
-            all: true,
-            directory: getPushFilename("entryPattern", config2)
-          }),
+          withSyncEngineFilter(
+            publishFilter,
+            () => EntryPatternPublishModule.handler({
+              ...otherParams,
+              all: true,
+              directory: getPushFilename("entryPattern", config2)
+            })
+          ),
           {
             text: "publishing entry patterns...",
             successText: "published entry patterns",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.49.5-alpha.10+97590818af",
+  "version": "20.49.5-alpha.11+4c766b7688",
   "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.49.5-alpha.10+97590818af",
-    "@uniformdev/canvas": "20.49.5-alpha.10+97590818af",
-    "@uniformdev/context": "20.49.5-alpha.10+97590818af",
-    "@uniformdev/files": "20.49.5-alpha.10+97590818af",
-    "@uniformdev/project-map": "20.49.5-alpha.10+97590818af",
-    "@uniformdev/redirect": "20.49.5-alpha.10+97590818af",
-    "@uniformdev/richtext": "20.49.5-alpha.10+97590818af",
+    "@uniformdev/assets": "20.49.5-alpha.11+4c766b7688",
+    "@uniformdev/canvas": "20.49.5-alpha.11+4c766b7688",
+    "@uniformdev/context": "20.49.5-alpha.11+4c766b7688",
+    "@uniformdev/files": "20.49.5-alpha.11+4c766b7688",
+    "@uniformdev/project-map": "20.49.5-alpha.11+4c766b7688",
+    "@uniformdev/redirect": "20.49.5-alpha.11+4c766b7688",
+    "@uniformdev/richtext": "20.49.5-alpha.11+4c766b7688",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "97590818aff0ababfb057278ba981112e219bf43"
+  "gitHead": "4c766b76885644538ea47a284a10cdb1ffc31388"
 }