@uniformdev/cli 19.86.1-alpha.15 → 19.88.0

package/dist/index.d.mts

@@ -1,4 +1,9 @@
 #!/usr/bin/env node
+type CLICompositionState = 'preview' | 'published' | number;
+type StateArgs = {
+    state: CLICompositionState;
+};
+
 type SyncMode = 'mirror' | 'createOrUpdate' | 'create';
 type EntityTypes = 'category' | 'dataType' | 'quirk' | 'test' | 'signal' | 'enrichment' | 'aggregate' | 'component' | 'composition' | 'pattern' | 'projectMapDefinition' | 'projectMapNode' | 'redirect' | 'entry' | 'contentType' | 'asset';
 type SyncFileFormat = 'yaml' | 'json';
@@ -8,7 +13,8 @@ type EntityConfiguration = {
     format?: SyncFileFormat;
     disabled?: true;
 };
-type CompositionAndPatternConfiguration = EntityConfiguration & {
+type EntityWithStateConfiguration = EntityConfiguration & Partial<StateArgs>;
+type PublishableEntitiesConfiguration = EntityWithStateConfiguration & {
     publish?: boolean;
 };
 type SerializationConfiguration = {
@@ -16,8 +22,9 @@ type SerializationConfiguration = {
         pull?: EntityConfiguration;
         push?: EntityConfiguration;
     } & EntityConfiguration> & {
-        composition?: CompositionAndPatternConfiguration;
-        pattern?: CompositionAndPatternConfiguration;
+        composition?: PublishableEntitiesConfiguration;
+        pattern?: PublishableEntitiesConfiguration;
+        entry?: EntityWithStateConfiguration;
     }>;
     directory: string;
     mode: SyncMode;

package/dist/index.mjs

@@ -7,7 +7,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// ../../node_modules/.pnpm/tsup@8.0.1_@microsoft+api-extractor@7.36.3_postcss@8.4.31_typescript@5.3.2/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.0.1_@microsoft+api-extractor@7.38.3_postcss@8.4.32_typescript@5.3.2/node_modules/tsup/assets/esm_shims.js
 import { fileURLToPath } from "url";
 import path from "path";
 var getFilename = () => fileURLToPath(import.meta.url);
@@ -674,6 +674,7 @@ import { UncachedFileClient } from "@uniformdev/files";
 // src/files/index.ts
 import { preferredType } from "@thi.ng/mime";
 import { FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
+import { createHash } from "crypto";
 import fsj from "fs-jetpack";
 import sizeOf from "image-size";
 import PQueue from "p-queue";
@@ -794,33 +795,39 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
   let objectAsString = JSON.stringify(object);
   const uniformFileUrlMatches = getUniformFileUrlMatches(objectAsString);
   const writeDirectory = getFilesDirectory(options.directory);
+  const isPackage = isPathAPackageFile(options.directory);
+  const legacyWriteDirectory = isPackage ? dirname2(options.directory) : options.directory;
   if (uniformFileUrlMatches) {
     const fileUploadQueue = new PQueue({ concurrency: 3 });
     for (const match of uniformFileUrlMatches) {
       const url = match[1];
       const hash = urlToHash(url);
+      const legacyHash = legacyUrlToHash(url);
       fileUploadQueue.add(async () => {
         try {
           const fileAlreadyExistsChecks = await Promise.all([
             options.fileClient.get({ url }).catch(() => null),
-            options.fileClient.get({ sourceId: hash }).catch(() => null)
+            options.fileClient.get({ sourceId: hash }).catch(() => null),
+            options.fileClient.get({ sourceId: legacyHash }).catch(() => null)
           ]);
           if (fileAlreadyExistsChecks.some((check) => check !== null)) {
             return;
           }
           const localFileName = urlToFileName(url);
-          const expectedFilePath = join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName);
-          const fileExistsLocally = await fsj.existsAsync(expectedFilePath);
+          let expectedFilePath = join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName);
+          let fileExistsLocally = await fsj.existsAsync(expectedFilePath);
+          if (!fileExistsLocally) {
+            const localFileName2 = legacyUrlToFileName(url);
+            expectedFilePath = join2(legacyWriteDirectory, FILES_DIRECTORY_NAME, localFileName2);
+            fileExistsLocally = await fsj.existsAsync(expectedFilePath);
+          }
           if (!fileExistsLocally) {
             console.warn(
               `Skipping file ${url} as we couldn't find a local copy (looked at ${expectedFilePath})`
             );
             return;
           }
-          const fileBuffer = await fsj.readAsync(
-            join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName),
-            "buffer"
-          );
+          const fileBuffer = await fsj.readAsync(expectedFilePath, "buffer");
           if (!fileBuffer) {
             console.warn(`Skipping file ${url} as we couldn't read it`);
             return;
@@ -888,11 +895,13 @@ var swapOutUniformFileUrlsForTargetProject = async (object, options) => {
     for (const match of uniformFileUrlMatches) {
       const url = match[1];
       const hash = urlToHash(url);
+      const legacyHash = legacyUrlToHash(url);
       fileUrlReplacementQueue.add(async () => {
         try {
           const fileAlreadyExistsChecks = await Promise.all([
             options.fileClient.get({ url }).catch(() => null),
-            options.fileClient.get({ sourceId: hash }).catch(() => null)
+            options.fileClient.get({ sourceId: hash }).catch(() => null),
+            options.fileClient.get({ sourceId: legacyHash }).catch(() => null)
           ]);
           const file = fileAlreadyExistsChecks.find((check) => check !== null);
           if (!file) {
@@ -965,6 +974,16 @@ var updateAssetFileIdBasedOnUrl = async (asset, options) => {
   };
   return asset;
 };
+var legacyUrlToHash = (url) => {
+  const hash = createHash("sha256");
+  hash.update(url);
+  return hash.digest("hex");
+};
+var legacyUrlToFileName = (url) => {
+  const fileName = legacyUrlToHash(url);
+  const fileExtension = urlToFileExtension(url);
+  return `${fileName}${fileExtension ? `.${fileExtension}` : ""}`;
+};
 
 // src/commands/canvas/assetEngineDataSource.ts
 import { convertAssetToPutAsset } from "@uniformdev/assets";
@@ -5604,7 +5623,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "19.86.0",
+  version: "19.88.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -7728,6 +7747,7 @@ var SyncPullModule = {
     )
   ),
   handler: async ({ serialization, ...otherParams }) => {
+    var _a;
     const config2 = serialization;
     const enabledEntities = Object.entries({
       asset: AssetPullModule,
@@ -7748,8 +7768,8 @@ var SyncPullModule = {
       entry: EntryPullModule,
       contentType: ContentTypePullModule
     }).filter(([entityType]) => {
-      var _a, _b, _c, _d, _e, _f;
-      return Boolean((_a = config2.entitiesConfig) == null ? void 0 : _a[entityType]) && ((_c = (_b = config2.entitiesConfig) == null ? void 0 : _b[entityType]) == null ? void 0 : _c.disabled) !== true && ((_f = (_e = (_d = config2.entitiesConfig) == null ? void 0 : _d[entityType]) == null ? void 0 : _e.pull) == null ? void 0 : _f.disabled) !== true;
+      var _a2, _b, _c, _d, _e, _f;
+      return Boolean((_a2 = config2.entitiesConfig) == null ? void 0 : _a2[entityType]) && ((_c = (_b = config2.entitiesConfig) == null ? void 0 : _b[entityType]) == null ? void 0 : _c.disabled) !== true && ((_f = (_e = (_d = config2.entitiesConfig) == null ? void 0 : _d[entityType]) == null ? void 0 : _e.pull) == null ? void 0 : _f.disabled) !== true;
     });
     if (enabledEntities.length === 0) {
       throw new Error(
@@ -7758,10 +7778,14 @@ var SyncPullModule = {
     }
     for (const [entityType, module3] of enabledEntities) {
       const spinner = spin(entityType);
+      const entityConfigSupportsPullState = (entityConfig2) => {
+        return entityConfig2 !== void 0 && "state" in entityConfig2;
+      };
+      const entityConfig = (_a = config2.entitiesConfig) == null ? void 0 : _a[entityType];
       try {
         await module3.handler({
           ...otherParams,
-          state: 0,
+          state: entityConfigSupportsPullState(entityConfig) ? entityConfig.state ?? 0 : 0,
           format: getFormat(entityType, config2),
           onlyCompositions: entityType === "composition" ? true : void 0,
           onlyPatterns: entityType === "pattern" ? true : void 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.86.1-alpha.15+d0028b600",
+  "version": "19.88.0",
   "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.86.1-alpha.15+d0028b600",
-    "@uniformdev/canvas": "19.86.1-alpha.15+d0028b600",
-    "@uniformdev/context": "19.86.1-alpha.15+d0028b600",
-    "@uniformdev/files": "19.86.1-alpha.15+d0028b600",
-    "@uniformdev/project-map": "19.86.1-alpha.15+d0028b600",
-    "@uniformdev/redirect": "19.86.1-alpha.15+d0028b600",
+    "@uniformdev/assets": "19.88.0",
+    "@uniformdev/canvas": "19.88.0",
+    "@uniformdev/context": "19.88.0",
+    "@uniformdev/files": "19.88.0",
+    "@uniformdev/project-map": "19.88.0",
+    "@uniformdev/redirect": "19.88.0",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "8.3.6",
@@ -69,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d0028b60072915cdc68eb415b9dd066d6a3ffff7"
+  "gitHead": "0a02f919a6b0f0c41307f120adada2e5d45a947b"
 }