@blokkli/editor 1.0.0 → 1.0.1

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "blokkli",
   "configKey": "blokkli",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "compatibility": {
     "nuxt": "^3.12.0"
   },

package/dist/module.mjs

@@ -6,7 +6,7 @@ import { createUnplugin } from 'unplugin';
 import MagicString from 'magic-string';
 import { walk } from 'estree-walker-ts';
 
-const version = "1.0.0";
+const version = "1.0.1";
 
 function sortObjectKeys(obj) {
   const sortedKeys = Object.keys(obj).sort();
@@ -4972,12 +4972,14 @@ const module = defineNuxtModule({
       followSymbolicLinks: false
     }) : [];
     await featureExtractor.addFiles([...builtinFeatures, ...customFeatures]);
-    const features = featureExtractor.getFeatures().filter((v) => {
+    const extractedFeatures = featureExtractor.getFeatures();
+    const features = extractedFeatures.filter((v) => {
       return v.id !== "theme" || moduleOptions.enableThemeEditor;
     });
     const featuresContext = {
       features
     };
+    const allFeatureIds = extractedFeatures.map((v) => v.id);
     if (moduleOptions.alterFeatures) {
       featuresContext.features = await Promise.resolve(
         moduleOptions.alterFeatures(featuresContext)
@@ -5023,7 +5025,7 @@ export const availableFeaturesAtBuild = ${JSON.stringify(
           availableFeaturesAtBuild
         )} as const
 
-export type ValidFeatureKey = typeof availableFeaturesAtBuild[number]
+export type ValidFeatureKey = ${allFeatureIds.map((v) => '"' + v + '"').join(" | ")}
 
 type FeatureComponent = {
   id: string

package/dist/runtime/components/Edit/Features/BlockAddList/index.vue

@@ -60,7 +60,11 @@ import {
   nextTick,
 } from '#imports'
 import { AddListItem } from '#blokkli/components'
-import type { Command, DraggableExistingBlock } from '#blokkli/types'
+import type {
+  Command,
+  DraggableExistingBlock,
+  FieldConfig,
+} from '#blokkli/types'
 import { getDefaultDefinition } from '#blokkli/definitions'
 import defineCommands from '#blokkli/helpers/composables/defineCommands'
 import onBlokkliEvent from '#blokkli/helpers/composables/onBlokkliEvent'
@@ -225,7 +229,7 @@ const getBundlesForAppendCommands = () => {
   }
 
   const block = selection.blocks.value[0]
-  const field = types.getFieldConfig(
+  const field: FieldConfig | undefined = types.getFieldConfig(
     block.hostType,
     block.hostBundle,
     block.hostFieldName,
@@ -256,7 +260,7 @@ const getAppendEndCommands = (): Command[] => {
       context.value.entityType,
       context.value.entityBundle,
     )
-    .flatMap((field) => {
+    .flatMap((field: FieldConfig) => {
       if (field.cardinality !== -1) {
         const key = getFieldKey(context.value.entityUuid, field.name)
         const count = state.getFieldBlockCount(key)
@@ -267,7 +271,7 @@ const getAppendEndCommands = (): Command[] => {
       }
       return field.allowedBundles
         .filter((v) => !reservedBundles.includes(v))
-        .map((bundle) => {
+        .map((bundle: string) => {
           const definition = types.getBlockBundleDefinition(bundle)
           return {
             id: 'block_add_list:append_end:' + bundle + field.name,
@@ -350,29 +354,31 @@ const getInsertCommands = (
       }
     })
 
-  const commands: Command[] = nestedFields.flatMap((field) => {
-    return field.allowedBundles.map((bundle) => {
-      const label = types.getBlockBundleDefinition(bundle)?.label || bundle
-      return {
-        id: 'block_add_list:insert:' + field.name + ':' + bundle,
-        label: $t(
-          'addBlockCommand.insertInField',
-          'Insert "@block" into "@field"',
-        )
-          .replace('@block', label)
-          .replace('@field', field.label),
-        group: 'add',
-        bundle,
-        callback: () =>
-          commandCallbackInsert(
-            bundle,
-            field.name,
-            field.entityType,
-            field.uuid,
-          ),
-      }
-    })
-  })
+  const commands: Command[] = nestedFields.flatMap(
+    (field: FieldConfig & { uuid: string }) => {
+      return field.allowedBundles.map((bundle: string) => {
+        const label = types.getBlockBundleDefinition(bundle)?.label || bundle
+        return {
+          id: 'block_add_list:insert:' + field.name + ':' + bundle,
+          label: $t(
+            'addBlockCommand.insertInField',
+            'Insert "@block" into "@field"',
+          )
+            .replace('@block', label)
+            .replace('@field', field.label),
+          group: 'add',
+          bundle,
+          callback: () =>
+            commandCallbackInsert(
+              bundle,
+              field.name,
+              field.entityType,
+              field.uuid,
+            ),
+        }
+      })
+    },
+  )
 
   if (block.hostType === runtimeConfig.itemEntityType) {
     const parentBlock = dom.findBlock(block.hostUuid)

package/dist/runtime/components/Edit/Features/Library/LibraryDialog/index.vue

@@ -93,7 +93,7 @@ import type {
 } from '#blokkli/adapter'
 import { FormOverlay, Icon } from '#blokkli/components'
 import Loading from './../../../Loading/index.vue'
-import type { BlokkliFieldElement } from '#blokkli/types'
+import type { BlokkliFieldElement, FieldConfig } from '#blokkli/types'
 import { ref, useBlokkli, useAsyncData, computed, watch } from '#imports'
 import LibraryListItem from './Item/index.vue'
 
@@ -115,13 +115,12 @@ const selectedItem = ref('')
 const page = ref(0)
 
 const allowedBundles = computed<string[]>(() => {
-  return (
-    types.getFieldConfig(
-      props.field.hostEntityType,
-      props.field.hostEntityBundle,
-      props.field.name,
-    )?.allowedBundles || []
-  ).filter((v) => {
+  const fieldConfig: FieldConfig | undefined = types.getFieldConfig(
+    props.field.hostEntityType,
+    props.field.hostEntityBundle,
+    props.field.name,
+  )
+  return (fieldConfig?.allowedBundles || []).filter((v) => {
     return types.getBlockBundleDefinition(v)?.allowReusable
   })
 })

package/dist/runtime/components/Edit/Features/MediaLibrary/Library/index.vue

@@ -98,7 +98,7 @@ import {
   nextTick,
 } from '#imports'
 import { Sortli, Icon } from '#blokkli/components'
-import type { MediaLibraryFilter } from './../types'
+import type { MediaLibraryFilter, MediaLibraryGetResults } from './../types'
 import type { BlokkliIcon } from '#blokkli/icons'
 
 const props = defineProps<{
@@ -150,15 +150,16 @@ watch(key, () => {
   page.value = 0
 })
 
-const { data, status } = await useLazyAsyncData(
-  () => {
-    return adapter.mediaLibraryGetResults!({
-      filters: filterValues.value,
-      page: page.value,
-    })
-  },
-  { watch: [key, page] },
-)
+const { data, status } =
+  await useLazyAsyncData<MediaLibraryGetResults<any> | null>(
+    () => {
+      return adapter.mediaLibraryGetResults!({
+        filters: filterValues.value,
+        page: page.value,
+      })
+    },
+    { watch: [key, page] },
+  )
 
 watch(data, () => {
   nextTick(() => {

package/dist/runtime/components/Edit/Features/MediaLibrary/index.vue

@@ -111,7 +111,7 @@ defineDropAreas((dragItems) => {
   // Generate a drop area for every matching droppable field.
   return dom
     .getAllDroppableFields()
-    .map<DropArea | undefined>((field) => {
+    .map<DropArea | undefined>((field: DroppableEntityField) => {
       const config = types.getDroppableFieldConfig(field.fieldName, field.host)
       // @TODO: This should be provided by the adapter on the item.
       if (config.allowedEntityType !== 'media') {

package/dist/runtime/components/Edit/Features/Search/Overlay/Results/Content/index.vue

@@ -96,7 +96,7 @@ const doSearch = () => {
     // This component can only ever be rendered if this adapter method exists,
     // so we can safely assume it's there.
     adapter.getContentSearchResults!(props.tab, props.search).then(
-      (newItems) => {
+      (newItems: SearchContentItem[]) => {
         items.value = newItems
         itemsSearchTerm.value = searchTerm
         isLoading.value = false

package/dist/runtime/helpers/featuresProvider.d.ts

@@ -8,11 +8,11 @@ export type FeaturesProvider = {
 };
 export default function (): {
     features: ComputedRef<{
-        id: "artboard" | "clipboard" | "delete" | "duplicate" | "edit" | "exit" | "grid" | "help" | "history" | "multi-select" | "preview" | "publish" | "revert" | "search" | "selection" | "options" | "add-list" | "assistant" | "block-add-list" | "command-palette" | "comments" | "conversions" | "debug" | "dragging-overlay" | "edit-form" | "editable-field" | "editable-mask" | "entity-title" | "field-areas" | "fragments" | "import-existing" | "library" | "media-library" | "ownership" | "preview-grant" | "responsive-preview" | "settings" | "structure" | "theme" | "touch-action-bar" | "tour" | "transform" | "translations" | "validations" | "demo-feature";
+        id: ValidFeatureKey;
         label?: string | undefined;
         icon: import("../../../playground/.nuxt/blokkli/icons").BlokkliIcon;
         description?: string | undefined;
-        dependencies?: ("artboard" | "clipboard" | "delete" | "duplicate" | "edit" | "exit" | "grid" | "help" | "history" | "multi-select" | "preview" | "publish" | "revert" | "search" | "selection" | "options" | "add-list" | "assistant" | "block-add-list" | "command-palette" | "comments" | "conversions" | "debug" | "dragging-overlay" | "edit-form" | "editable-field" | "editable-mask" | "entity-title" | "field-areas" | "fragments" | "import-existing" | "library" | "media-library" | "ownership" | "preview-grant" | "responsive-preview" | "settings" | "structure" | "theme" | "touch-action-bar" | "tour" | "transform" | "translations" | "validations" | "demo-feature")[] | undefined;
+        dependencies?: ValidFeatureKey[] | undefined;
         viewports?: import("../constants").Viewport[] | undefined;
         requiredAdapterMethods?: (keyof import("../adapter").BlokkliAdapter<any>)[] | undefined;
         settings?: Record<string, import("#blokkli/types").FeatureDefinitionSetting> | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blokkli/editor",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Interactive page building experience for Nuxt",
   "repository": "blokkli/editor",
   "type": "module",