@uniformdev/cli 20.24.1-alpha.0 → 20.24.4-alpha.26

package/dist/index.mjs

@@ -312,6 +312,7 @@ async function syncEngine({
   whatIf = false,
   log: log2 = () => {
   },
+  onBeforeProcessObject,
   onBeforeCompareObjects,
   onBeforeWriteObject,
   onError
@@ -357,6 +358,9 @@ async function syncEngine({
   let sourceHasItems = false;
   for await (let sourceObject of source.objects) {
     sourceHasItems = true;
+    if (onBeforeProcessObject) {
+      await onBeforeProcessObject(sourceObject);
+    }
     const ids = Array.isArray(sourceObject.id) ? sourceObject.id : [sourceObject.id];
     const targetObject = targetItems.get(ids[0]);
     status.compared++;
@@ -2775,6 +2779,34 @@ var ComponentPatternPullModule = {
   )
 };
 
+// src/commands/canvas/util/localeValidation.ts
+import { LocaleClient } from "@uniformdev/canvas";
+async function fetchUniformLocales(options) {
+  const client = new LocaleClient({
+    ...options,
+    bypassCache: true,
+    limitPolicy: cliLimitPolicy
+  });
+  const locales = (await client.get()).results;
+  return new Set(locales.map((locale) => locale.locale));
+}
+function validateEntityLocales(entity, uniformLocales, entityName) {
+  if (!entity._locales || entity._locales.length === 0) {
+    return;
+  }
+  const invalidLocales = entity._locales.filter((locale) => !uniformLocales.has(locale));
+  if (invalidLocales.length > 0) {
+    console.warn(
+      `\u26A0\uFE0F ${entityName} enables locale${invalidLocales.length > 1 ? "s" : ""} ${invalidLocales.join(", ")} that are not registered in your Uniform project. This may cause unexpected behavior.`
+    );
+  }
+}
+function createLocaleValidationHook(uniformLocales) {
+  return async (entity) => {
+    validateEntityLocales(entity, uniformLocales, entity.displayName);
+  };
+}
+
 // src/commands/canvas/commands/composition/push.ts
 var CompositionPushModule = componentInstancePushModuleFactory("compositions");
 function componentInstancePushModuleFactory(type) {
@@ -2857,6 +2889,13 @@ function componentInstancePushModuleFactory(type) {
         verbose
       });
       const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
+      const uniformLocales = await fetchUniformLocales({
+        apiKey,
+        apiHost,
+        fetch: fetch2,
+        projectId
+      });
+      const localeValidationHook = createLocaleValidationHook(uniformLocales);
       await syncEngine({
         source,
         target,
@@ -2865,6 +2904,12 @@ function componentInstancePushModuleFactory(type) {
         verbose,
         allowEmptySource,
         log: createSyncEngineConsoleLogger({ diffMode }),
+        onBeforeProcessObject: async (sourceObject) => {
+          await localeValidationHook({
+            _locales: sourceObject.object.composition._locales,
+            displayName: sourceObject.displayName ?? sourceObject.providerId
+          });
+        },
         onBeforeCompareObjects: async (sourceObject) => {
           return replaceLocalUrlsWithRemoteReferences({
             entity: sourceObject,
@@ -4583,6 +4628,13 @@ var EntryPushModule = {
     }
     const target = createEntryEngineDataSource({ client, state, onlyEntries: true });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const uniformLocales = await fetchUniformLocales({
+      apiKey,
+      apiHost,
+      fetch: fetch2,
+      projectId
+    });
+    const localeValidationHook = createLocaleValidationHook(uniformLocales);
     await syncEngine({
       source,
       target,
@@ -4590,6 +4642,12 @@ var EntryPushModule = {
       whatIf,
       allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode }),
+      onBeforeProcessObject: async (sourceObject) => {
+        await localeValidationHook({
+          _locales: sourceObject.object.entry._locales,
+          displayName: sourceObject.displayName ?? sourceObject.providerId
+        });
+      },
       onBeforeCompareObjects: async (sourceObject) => {
         return replaceLocalUrlsWithRemoteReferences({
           entity: sourceObject,
@@ -4976,11 +5034,11 @@ var EntryPatternPullModule = {
       const packageContents = readCanvasPackage(directory, false, verbose);
       target = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
-        objects: packageContents.entries ?? [],
+        objects: packageContents.entryPatterns ?? [],
         selectIdentifier: selectEntryIdentifier,
         selectDisplayName: selectEntryDisplayName,
         onSyncComplete: async (_, synced) => {
-          packageContents.entries = synced;
+          packageContents.entryPatterns = synced;
           writeCanvasPackage(directory, packageContents);
         }
       });
@@ -5078,7 +5136,7 @@ var EntryPatternPushModule = {
       const packageContents = readCanvasPackage(directory, true, verbose);
       source = await createArraySyncEngineDataSource({
         name: `Package file ${directory}`,
-        objects: packageContents.entries ?? [],
+        objects: packageContents.entryPatterns ?? [],
         selectIdentifier: selectEntryIdentifier,
         selectDisplayName: selectEntryDisplayName
       });
@@ -5092,6 +5150,13 @@ var EntryPatternPushModule = {
     }
     const target = createEntryEngineDataSource({ client, state, onlyPatterns: true });
     const fileClient = getFileClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const uniformLocales = await fetchUniformLocales({
+      apiKey,
+      apiHost,
+      fetch: fetch2,
+      projectId
+    });
+    const localeValidationHook = createLocaleValidationHook(uniformLocales);
     await syncEngine({
       source,
       target,
@@ -5099,6 +5164,12 @@ var EntryPatternPushModule = {
       whatIf,
       allowEmptySource,
       log: createSyncEngineConsoleLogger({ diffMode }),
+      onBeforeProcessObject: async (sourceObject) => {
+        await localeValidationHook({
+          _locales: sourceObject.object.entry._locales,
+          displayName: sourceObject.displayName ?? sourceObject.providerId
+        });
+      },
       onBeforeCompareObjects: async (sourceObject) => {
         return replaceLocalUrlsWithRemoteReferences({
           entity: sourceObject,
@@ -5303,9 +5374,9 @@ function createLocaleEngineDataSource({
 }
 
 // src/commands/canvas/commands/locale/_util.ts
-import { LocaleClient } from "@uniformdev/canvas";
+import { LocaleClient as LocaleClient2 } from "@uniformdev/canvas";
 function getLocaleClient(options) {
-  return new LocaleClient({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
+  return new LocaleClient2({ ...options, bypassCache: true, limitPolicy: cliLimitPolicy });
 }
 
 // src/commands/canvas/commands/locale/pull.ts
@@ -8232,16 +8303,29 @@ var IntegrationEdgehancerDeployModule = {
           yargs35.positional("filename", {
             demandOption: true,
             describe: "ESM code file to run for the target edgehancer hook. Refer to the documentation for expected types."
+          }).option("compatibilityDate", {
+            type: "string",
+            describe: "Date indicating targeted support in the custom edgehancer runtime. Backwards incompatible fixes to the runtime following this date will not affect this custom edgehancer. Format: YYYY-MM-DD. You can check here for more information: https://developers.cloudflare.com/workers/configuration/compatibility-dates/#setting-compatibility-date"
           })
         )
       )
     )
   ),
-  handler: async ({ apiHost, apiKey, proxy, filename, team: teamId, archetype, connectorType, hook }) => {
+  handler: async ({
+    apiHost,
+    apiKey,
+    proxy,
+    filename,
+    team: teamId,
+    archetype,
+    connectorType,
+    hook,
+    compatibilityDate
+  }) => {
     const fetch2 = nodeFetchProxy(proxy);
     const client = new EdgehancerClient({ apiKey, apiHost, fetch: fetch2, teamId });
     const code = readFileSync(filename, "utf8");
-    await client.deploy({ archetype, code, connectorType, hook });
+    await client.deploy({ archetype, code, connectorType, hook, compatibilityDate });
   }
 };
 
@@ -8464,7 +8548,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "20.24.0",
+  version: "20.25.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "20.24.1-alpha.0+9e8dbc01e8",
+  "version": "20.24.4-alpha.26+80d802be78",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,13 +27,13 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "20.24.1-alpha.0+9e8dbc01e8",
-    "@uniformdev/canvas": "20.24.1-alpha.0+9e8dbc01e8",
-    "@uniformdev/context": "20.24.1-alpha.0+9e8dbc01e8",
-    "@uniformdev/files": "20.24.1-alpha.0+9e8dbc01e8",
-    "@uniformdev/project-map": "20.24.1-alpha.0+9e8dbc01e8",
-    "@uniformdev/redirect": "20.24.1-alpha.0+9e8dbc01e8",
-    "@uniformdev/richtext": "20.24.1-alpha.0+9e8dbc01e8",
+    "@uniformdev/assets": "20.24.4-alpha.26+80d802be78",
+    "@uniformdev/canvas": "20.24.4-alpha.26+80d802be78",
+    "@uniformdev/context": "20.24.4-alpha.26+80d802be78",
+    "@uniformdev/files": "20.24.4-alpha.26+80d802be78",
+    "@uniformdev/project-map": "20.24.4-alpha.26+80d802be78",
+    "@uniformdev/redirect": "20.24.4-alpha.26+80d802be78",
+    "@uniformdev/richtext": "20.24.4-alpha.26+80d802be78",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -79,5 +79,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9e8dbc01e870c404b63c19326477dbb3910ec14a"
+  "gitHead": "80d802be787a855a99bfe70f2b6cbdb17e71cbae"
 }