@uniformdev/cli 19.145.0 → 19.146.1-alpha.3

package/dist/index.mjs

@@ -352,7 +352,8 @@ var getEntityOption = ({
 var getDirectoryOrFilename = ({
   config: config2,
   entityType,
-  operation
+  operation,
+  defaultEntityFolderName = entityType
 }) => {
   var _a, _b, _c, _d, _e, _f;
   if ((_b = (_a = config2.entitiesConfig[entityType]) == null ? void 0 : _a[operation]) == null ? void 0 : _b.directory) {
@@ -365,7 +366,7 @@ var getDirectoryOrFilename = ({
   if (isPackage) {
     return config2.directory;
   }
-  return `${config2.directory}/${entityType}`;
+  return `${config2.directory}/${defaultEntityFolderName}`;
 };
 
 // src/sync/fileSyncEngineDataSource.ts
@@ -2052,6 +2053,7 @@ var CompositionListModule = {
             yargs33.options({
               offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
               limit: { describe: "Number of rows to fetch", type: "number", default: 20 },
+              search: { describe: "Search query", type: "string", default: "" },
               resolvePatterns: {
                 type: "boolean",
                 default: false,
@@ -2090,6 +2092,7 @@ var CompositionListModule = {
     proxy,
     limit,
     offset,
+    search,
     format,
     filename,
     onlyCompositions,
@@ -2105,6 +2108,7 @@ var CompositionListModule = {
     const res = await client.getCompositionList({
       limit,
       offset,
+      search: search.length > 0 ? search : void 0,
       pattern: onlyCompositions ? false : onlyPatterns ? true : void 0,
       state: convertStateOption(state),
       skipPatternResolution: !resolvePatterns,
@@ -3551,7 +3555,11 @@ var EntryListModule = {
       withApiOptions(
         withProjectOptions(
           withStateOptions(
-            yargs33,
+            yargs33.options({
+              offset: { describe: "Number of rows to skip before fetching", type: "number", default: 0 },
+              limit: { describe: "Number of rows to fetch", type: "number", default: 1e3 },
+              search: { describe: "Search query", type: "string", default: "" }
+            }),
             // for backwards compatibility, we default to the "published" state, unlike compositions
             "published"
           )
@@ -3559,12 +3567,25 @@ var EntryListModule = {
       )
     )
   ),
-  handler: async ({ apiHost, edgeApiHost, apiKey, proxy, format, filename, project: projectId, state }) => {
+  handler: async ({
+    apiHost,
+    edgeApiHost,
+    apiKey,
+    proxy,
+    format,
+    filename,
+    project: projectId,
+    state,
+    limit,
+    offset,
+    search
+  }) => {
     const fetch3 = nodeFetchProxy(proxy);
     const client = new ContentClient8({ apiKey, apiHost, edgeApiHost, fetch: fetch3, projectId, bypassCache: true });
     const res = await client.getEntries({
-      offset: 0,
-      limit: 1e3,
+      offset,
+      limit,
+      search: search.length > 0 ? search : void 0,
       state: convertStateOption(state),
       skipOverridesResolution: true,
       skipPatternResolution: true,
@@ -6873,7 +6894,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.145.0",
+  version: "19.146.2",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -9009,7 +9030,9 @@ var SyncPullModule = {
   handler: async ({ serialization, ...otherParams }) => {
     var _a, _b;
     const config2 = serialization;
+    let isUsingDeprecatedPatternConfig = false;
     if (config2.entitiesConfig.pattern) {
+      isUsingDeprecatedPatternConfig = true;
       (_a = config2.entitiesConfig).componentPattern ?? (_a.componentPattern = config2.entitiesConfig.pattern);
     }
     const enabledEntities = Object.entries({
@@ -9056,7 +9079,7 @@ var SyncPullModule = {
           onlyCompositions: entityType === "composition" ? true : void 0,
           onlyPatterns: entityType === "componentPattern" ? true : void 0,
           mode: getPullMode(entityType, config2),
-          directory: getPullFilename(entityType, config2),
+          directory: getPullFilename(entityType, config2, { isUsingDeprecatedPatternConfig }),
           allowEmptySource: config2.allowEmptySource
         });
         spinner.succeed();
@@ -9075,11 +9098,13 @@ var getPullMode = (entityType, config2) => {
     entityType
   });
 };
-var getPullFilename = (entityType, config2) => {
+var getPullFilename = (entityType, config2, { isUsingDeprecatedPatternConfig }) => {
   return getDirectoryOrFilename({
     operation: "pull",
     config: config2,
-    entityType
+    entityType,
+    // This fallback can be removed when publishing a major release
+    defaultEntityFolderName: isUsingDeprecatedPatternConfig && entityType === "componentPattern" ? "pattern" : void 0
   });
 };
 var getFormat = (entityType, config2) => {
@@ -9112,7 +9137,9 @@ var SyncPushModule = {
   handler: async ({ serialization, ...otherParams }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     const config2 = serialization;
+    let isUsingDeprecatedPatternConfig = false;
     if (config2.entitiesConfig.pattern) {
+      isUsingDeprecatedPatternConfig = true;
       (_a = config2.entitiesConfig).componentPattern ?? (_a.componentPattern = config2.entitiesConfig.pattern);
     }
     const enabledEntities = Object.entries({
@@ -9155,7 +9182,7 @@ var SyncPushModule = {
           onlyCompositions: entityType === "composition" ? true : void 0,
           onlyPatterns: entityType === "componentPattern" ? true : void 0,
           mode: getPushMode(entityType, config2),
-          directory: getPushFilename(entityType, config2),
+          directory: getPushFilename(entityType, config2, { isUsingDeprecatedPatternConfig }),
           allowEmptySource: config2.allowEmptySource
         });
         spinner.succeed();
@@ -9186,11 +9213,13 @@ var getPushMode = (entityType, config2) => {
     entityType
   });
 };
-var getPushFilename = (entityType, config2) => {
+var getPushFilename = (entityType, config2, { isUsingDeprecatedPatternConfig }) => {
   return getDirectoryOrFilename({
     operation: "push",
     config: config2,
-    entityType
+    entityType,
+    // This fallback can be removed when publishing a major release
+    defaultEntityFolderName: isUsingDeprecatedPatternConfig && entityType === "componentPattern" ? "pattern" : void 0
   });
 };
 var getFormat2 = (entityType, config2) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.145.0",
+  "version": "19.146.1-alpha.3+62962ddf19",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -17,12 +17,12 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "19.145.0",
-    "@uniformdev/canvas": "19.145.0",
-    "@uniformdev/context": "19.145.0",
-    "@uniformdev/files": "19.145.0",
-    "@uniformdev/project-map": "19.145.0",
-    "@uniformdev/redirect": "19.145.0",
+    "@uniformdev/assets": "19.146.1-alpha.3+62962ddf19",
+    "@uniformdev/canvas": "19.146.1-alpha.3+62962ddf19",
+    "@uniformdev/context": "19.146.1-alpha.3+62962ddf19",
+    "@uniformdev/files": "19.146.1-alpha.3+62962ddf19",
+    "@uniformdev/project-map": "19.146.1-alpha.3+62962ddf19",
+    "@uniformdev/redirect": "19.146.1-alpha.3+62962ddf19",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "8.3.6",
@@ -68,5 +68,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9d69378494595742da7893ecb4e34cde934477b0"
+  "gitHead": "62962ddf191560b0b15f627e93cf67ebbd4a11af"
 }