@uniformdev/cli 20.57.2-alpha.23 → 20.57.2-alpha.24

package/dist/defaultConfig.d.mts

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

package/dist/{index-DlNAs61A.d.mts → index-B-KaB0aa.d.mts}

@@ -21,13 +21,17 @@ type EntityFilterCriteriaConfig = {
 };
 type EntityFilterInclude = {
     /** If set, only entities matching the criteria will be synced. Cannot be combined with `exclude`. */
-    include: EntityFilterCriteriaConfig;
+    include: {
+        filters: EntityFilterCriteriaConfig;
+    };
     exclude?: never;
 };
 type EntityFilterExclude = {
     include?: never;
     /** If set, entities matching the criteria will be excluded from sync. Cannot be combined with `include`. */
-    exclude: EntityFilterCriteriaConfig;
+    exclude: {
+        filters: EntityFilterCriteriaConfig;
+    };
 };
 type EntityFilterNone = {
     include?: never;

package/dist/index.d.mts

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

package/dist/index.mjs

@@ -566,16 +566,18 @@ function resolveEntityFilter(entityConfig, operation) {
   const directional = entityConfig?.[operation];
   const resolvedInclude = directional?.include ?? entityConfig?.include;
   const resolvedExclude = directional?.exclude ?? entityConfig?.exclude;
-  const hasInclude = hasCriteria(resolvedInclude);
-  const hasExclude = hasCriteria(resolvedExclude);
+  const includeFilters = resolvedInclude?.filters;
+  const excludeFilters = resolvedExclude?.filters;
+  const hasInclude = hasCriteria(includeFilters);
+  const hasExclude = hasCriteria(excludeFilters);
   if (hasInclude && hasExclude) {
     const includeSource = directional?.include ? `${operation}.include` : "include";
     const excludeSource = directional?.exclude ? `${operation}.exclude` : "exclude";
     throw new Error(
-      `Entity filter for '${operation}' resolved both ${includeSource} and ${excludeSource}. Use one or the other. If a top-level filter conflicts with a per-direction filter, set the unwanted direction to { type: 'ids', match: [] } to clear it.`
+      `Entity filter for '${operation}' resolved both ${includeSource} and ${excludeSource}. Use one or the other. If a top-level filter conflicts with a per-direction filter, set the unwanted direction to { filters: { type: 'ids', match: [] } } to clear it.`
     );
   }
-  return createEntityFilter(resolvedInclude, resolvedExclude);
+  return createEntityFilter(includeFilters, excludeFilters);
 }
 function createEntityFilter(include, exclude) {
   const normalizedInclude = normalizeCriteria(include);
@@ -603,6 +605,7 @@ var VALID_FILTER_TYPES = ["ids", "nameContains"];
 var VALID_FILTER_FIELDS = ["include", "exclude"];
 var VALID_DIRECTION_KEYS = ["pull", "push"];
 var VALID_ENTITY_CONFIG_KEYS = /* @__PURE__ */ new Set([...VALID_DIRECTION_KEYS, ...VALID_FILTER_FIELDS]);
+var VALID_FILTER_BLOCK_KEYS = ["filters"];
 function validateEntityConfig(entityConfig, operation) {
   const validKeysLabel = [...VALID_ENTITY_CONFIG_KEYS].join(", ");
   for (const key of Object.keys(entityConfig)) {
@@ -624,28 +627,55 @@ function validateEntityConfig(entityConfig, operation) {
     }
   }
   for (const field of VALID_FILTER_FIELDS) {
-    validateFilterValue(entityConfig[field], field);
+    validateFilterBlock(entityConfig[field], field);
   }
   if (directional && typeof directional === "object") {
     for (const field of VALID_FILTER_FIELDS) {
-      validateFilterValue(directional[field], `${operation}.${field}`);
+      validateFilterBlock(directional[field], `${operation}.${field}`);
     }
   }
 }
-function validateFilterValue(value, label) {
+function validateFilterBlock(value, label) {
   if (value === void 0 || value === null) {
     return;
   }
   if (typeof value === "string") {
     throw new Error(
-      `"${label}" must be an object like { type: 'nameContains', match: '${value}' }, not a plain string.`
+      `"${label}" must be an object like { filters: { type: 'nameContains', match: '${value}' } }, not a plain string.`
     );
   }
   if (Array.isArray(value)) {
-    throw new Error(`"${label}" must be an object like { type: 'ids', match: [...] }, not a plain array.`);
+    throw new Error(
+      `"${label}" must be an object like { filters: { type: 'ids', match: [...] } }, not a plain array.`
+    );
   }
   if (typeof value !== "object") {
-    throw new Error(`"${label}" must be an object with "type" and "match" fields, but got ${typeof value}.`);
+    throw new Error(`"${label}" must be an object with a "filters" field, but got ${typeof value}.`);
+  }
+  const block = value;
+  if ("type" in block && "match" in block) {
+    throw new Error(
+      `"${label}" has "type" and "match" at the top level. Wrap them in a "filters" key: { filters: { type: '${block.type}', match: ... } }.`
+    );
+  }
+  const validBlockKeysLabel = VALID_FILTER_BLOCK_KEYS.join(", ");
+  for (const key of Object.keys(block)) {
+    if (!VALID_FILTER_BLOCK_KEYS.includes(key)) {
+      throw new Error(`Unknown key "${key}" in ${label}. Valid keys are: ${validBlockKeysLabel}.`);
+    }
+  }
+  if (block.filters !== void 0) {
+    validateFilterCriteria(block.filters, `${label}.filters`);
+  }
+}
+function validateFilterCriteria(value, label) {
+  if (value === void 0 || value === null) {
+    return;
+  }
+  if (typeof value !== "object" || Array.isArray(value)) {
+    throw new Error(
+      `${label} must be an object like { type: 'ids', match: [...] }, but got ${typeof value}.`
+    );
   }
   const criteria = value;
   if (!criteria.type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.57.2-alpha.23+75d5946be1",
+  "version": "20.57.2-alpha.24+b45bd27ec0",
   "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.57.2-alpha.23+75d5946be1",
-    "@uniformdev/canvas": "20.57.2-alpha.23+75d5946be1",
-    "@uniformdev/context": "20.57.2-alpha.23+75d5946be1",
-    "@uniformdev/files": "20.57.2-alpha.23+75d5946be1",
-    "@uniformdev/project-map": "20.57.2-alpha.23+75d5946be1",
-    "@uniformdev/redirect": "20.57.2-alpha.23+75d5946be1",
-    "@uniformdev/richtext": "20.57.2-alpha.23+75d5946be1",
+    "@uniformdev/assets": "20.57.2-alpha.24+b45bd27ec0",
+    "@uniformdev/canvas": "20.57.2-alpha.24+b45bd27ec0",
+    "@uniformdev/context": "20.57.2-alpha.24+b45bd27ec0",
+    "@uniformdev/files": "20.57.2-alpha.24+b45bd27ec0",
+    "@uniformdev/project-map": "20.57.2-alpha.24+b45bd27ec0",
+    "@uniformdev/redirect": "20.57.2-alpha.24+b45bd27ec0",
+    "@uniformdev/richtext": "20.57.2-alpha.24+b45bd27ec0",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "75d5946be1860adc22df527dd84b2d553dd61f54"
+  "gitHead": "b45bd27ec09cbc11c81b4abea2579548c5a57ed1"
 }