sb-mig 6.4.1-beta.1 → 6.4.1-beta.2

package/dist/api/copy/reference-rewriter.js

@@ -17,7 +17,13 @@ export const rewriteCopyReferences = ({ value, maps, schemas, }) => {
 const cloneJson = (value) => JSON.parse(JSON.stringify(value));
 const rewriteNode = (node, path, state) => {
     if (Array.isArray(node)) {
-        node.forEach((item, index) => rewriteNode(item, `${path}[${index}]`, state));
+        node.forEach((item, index) => {
+            if (typeof item === "string") {
+                rewriteBareStoryUuid(node, index, item, `${path}[${index}]`, state);
+                return;
+            }
+            rewriteNode(item, `${path}[${index}]`, state);
+        });
         return;
     }
     if (!isRecord(node)) {
@@ -27,6 +33,7 @@ const rewriteNode = (node, path, state) => {
     rewriteStoryLinkObject(node, path, state);
     rewriteRichtextLinkObject(node, path, state);
     rewriteSchemaAwareOptions(node, path, state);
+    rewriteBareStoryUuidValues(node, path, state);
     if (node.type === "blok" &&
         isRecord(node.attrs) &&
         Array.isArray(node.attrs.body)) {
@@ -88,6 +95,19 @@ const rewriteStoryLinkObject = (node, path, state) => {
             node.id = targetId;
         }
     }
+    if (typeof node.id === "string") {
+        const targetUuid = state.maps.storyUuids.get(node.id);
+        if (targetUuid !== undefined) {
+            addRecord(state, {
+                type: "story",
+                path: `${path}.id`,
+                sourceValue: node.id,
+                targetValue: targetUuid,
+                field: "id",
+            });
+            node.id = targetUuid;
+        }
+    }
     if (typeof node.uuid === "string") {
         const targetUuid = state.maps.storyUuids.get(node.uuid);
         if (targetUuid !== undefined) {
@@ -117,33 +137,80 @@ const rewriteSchemaAwareOptions = (node, path, state) => {
         return;
     }
     for (const [fieldName, fieldValue] of Object.entries(node)) {
-        if (RESERVED_CONTENT_KEYS.has(fieldName) ||
-            !Array.isArray(fieldValue)) {
+        if (RESERVED_CONTENT_KEYS.has(fieldName)) {
             continue;
         }
         const fieldSchema = getFieldSchema(schema, fieldName);
-        if (fieldSchema?.type !== "options" ||
-            fieldSchema.source !== "internal_stories") {
+        if (fieldSchema?.source !== "internal_stories") {
             continue;
         }
-        fieldValue.forEach((item, index) => {
-            if (typeof item !== "number") {
-                return;
-            }
-            const targetId = state.maps.storyIds.get(item);
-            if (targetId === undefined) {
-                return;
-            }
-            addRecord(state, {
-                type: "story",
-                path: `${path}.${fieldName}[${index}]`,
-                sourceValue: item,
-                targetValue: targetId,
-                field: "id",
+        if (fieldSchema.type === "options" && Array.isArray(fieldValue)) {
+            fieldValue.forEach((item, index) => {
+                rewriteStoryOptionItem(fieldValue, index, item, `${path}.${fieldName}[${index}]`, state);
             });
-            fieldValue[index] = targetId;
+            continue;
+        }
+        if (fieldSchema.type === "option") {
+            rewriteStoryOptionItem(node, fieldName, fieldValue, `${path}.${fieldName}`, state);
+        }
+    }
+};
+const rewriteStoryOptionItem = (container, key, item, path, state) => {
+    if (typeof item === "number") {
+        const targetId = state.maps.storyIds.get(item);
+        if (targetId === undefined) {
+            return;
+        }
+        addRecord(state, {
+            type: "story",
+            path,
+            sourceValue: item,
+            targetValue: targetId,
+            field: "id",
         });
+        container[key] = targetId;
+        return;
+    }
+    if (typeof item === "string") {
+        const targetUuid = state.maps.storyUuids.get(item);
+        if (targetUuid === undefined) {
+            return;
+        }
+        addRecord(state, {
+            type: "story",
+            path,
+            sourceValue: item,
+            targetValue: targetUuid,
+            field: "uuid",
+        });
+        container[key] = targetUuid;
+    }
+};
+// Safety net: any string value that is a key in storyUuids is a known
+// copied-story source uuid (block _uids, space ids and story ids live in other
+// namespaces), so rewriting exact matches is safe and covers custom plugin
+// fields and shared-selector.shared_component without schema knowledge.
+const rewriteBareStoryUuidValues = (node, path, state) => {
+    for (const [key, value] of Object.entries(node)) {
+        if (RESERVED_CONTENT_KEYS.has(key) || typeof value !== "string") {
+            continue;
+        }
+        rewriteBareStoryUuid(node, key, value, `${path}.${key}`, state);
+    }
+};
+const rewriteBareStoryUuid = (container, key, value, path, state) => {
+    const targetUuid = state.maps.storyUuids.get(value);
+    if (targetUuid === undefined) {
+        return;
     }
+    addRecord(state, {
+        type: "story",
+        path,
+        sourceValue: value,
+        targetValue: targetUuid,
+        field: "uuid",
+    });
+    container[key] = targetUuid;
 };
 const getFieldSchema = (schema, fieldName) => schema[fieldName] ?? schema[normalizeFieldName(fieldName)];
 const normalizeFieldName = (fieldName) => fieldName.replace(/[-_]+([a-zA-Z0-9])/g, (_, char) => char.toUpperCase());

package/dist/api/copy/reference-scanner.js

@@ -169,6 +169,9 @@ const scanField = ({ fieldValue, fieldSchema, path, state, }) => {
         case "options":
             scanOptionsField(fieldValue, fieldSchema, path, state);
             return;
+        case "option":
+            scanOptionField(fieldValue, fieldSchema, path, state);
+            return;
         case "bloks":
             scanBloksField(fieldValue, path, state);
             return;
@@ -225,14 +228,19 @@ const scanMultilinkField = (fieldValue, path, state) => {
     if (!isRecord(fieldValue) || fieldValue.linktype !== "story") {
         return;
     }
-    const referencedStoryId = typeof fieldValue.id === "number" ? fieldValue.id : undefined;
-    if (referencedStoryId === undefined) {
+    if (typeof fieldValue.id === "number") {
+        addStoryReference(state, {
+            path: `${path}.id`,
+            referencedStoryId: fieldValue.id,
+        });
         return;
     }
-    addStoryReference(state, {
-        path: `${path}.id`,
-        referencedStoryId,
-    });
+    if (typeof fieldValue.id === "string" && isUuidLike(fieldValue.id)) {
+        addStoryReference(state, {
+            path: `${path}.id`,
+            referencedStoryUuid: fieldValue.id,
+        });
+    }
 };
 const scanOptionsField = (fieldValue, fieldSchema, path, state) => {
     if (fieldSchema.source !== "internal_stories") {
@@ -247,9 +255,34 @@ const scanOptionsField = (fieldValue, fieldSchema, path, state) => {
                 path: `${path}[${index}]`,
                 referencedStoryId: value,
             });
+            return;
+        }
+        if (typeof value === "string" && isUuidLike(value)) {
+            addStoryReference(state, {
+                path: `${path}[${index}]`,
+                referencedStoryUuid: value,
+            });
         }
     });
 };
+const scanOptionField = (fieldValue, fieldSchema, path, state) => {
+    if (fieldSchema.source !== "internal_stories") {
+        return;
+    }
+    if (typeof fieldValue === "number") {
+        addStoryReference(state, {
+            path,
+            referencedStoryId: fieldValue,
+        });
+        return;
+    }
+    if (typeof fieldValue === "string" && isUuidLike(fieldValue)) {
+        addStoryReference(state, {
+            path,
+            referencedStoryUuid: fieldValue,
+        });
+    }
+};
 const scanBloksField = (fieldValue, path, state) => {
     if (!Array.isArray(fieldValue)) {
         state.warnings.push({
@@ -317,6 +350,8 @@ const addOpaqueField = (state, field) => {
         path: field.path,
     });
 };
+const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+const isUuidLike = (value) => UUID_PATTERN.test(value);
 const normalizeFieldName = (fieldName) => fieldName.replace(/__i18n__.*/, "");
 const getAssetNodeKey = (asset) => `${asset.sourceId}:${asset.sourceFilename}`;
 const isRecord = (value) => Boolean(value) && typeof value === "object" && !Array.isArray(value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sb-mig",
-  "version": "6.4.1-beta.1",
+  "version": "6.4.1-beta.2",
   "description": "CLI to rule the world. (and handle stuff related to Storyblok CMS)",
   "author": "Marcin Krawczyk <marckraw@icloud.com>",
   "license": "MIT",