@devvit/public-api 0.10.22-next-2024-06-06-7f14615a7.0 → 0.10.22-next-2024-06-10-118002c24.0

package/devvit/internals/blocks/handler/BlocksHandler.js

@@ -9,14 +9,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _BlocksHandler_instances, _BlocksHandler_root, _BlocksHandler_contextBuilder, _BlocksHandler_blocksTransformer, _BlocksHandler_loadHooks, _BlocksHandler_handleAsyncQueues, _BlocksHandler_attemptHook, _BlocksHandler_handleMainQueue, _BlocksHandler_renderRoot, _BlocksHandler_render, _BlocksHandler_renderList, _BlocksHandler_renderElement, _BlocksHandler_reifyProps, _BlocksHandler_resolveAsset;
-import { isAcceptableDataUrl, isRemoteUrl } from '@devvit/shared-types/imageUtil.js';
+var _BlocksHandler_instances, _BlocksHandler_root, _BlocksHandler_contextBuilder, _BlocksHandler_blocksTransformer, _BlocksHandler_loadHooks, _BlocksHandler_handleAsyncQueues, _BlocksHandler_attemptHook, _BlocksHandler_handleMainQueue, _BlocksHandler_renderRoot, _BlocksHandler_render, _BlocksHandler_renderList, _BlocksHandler_renderElement, _BlocksHandler_reifyProps;
 import isEqual from 'lodash.isequal';
 import { BlocksTransformer } from '../BlocksTransformer.js';
 import { ContextBuilder } from './ContextBuilder.js';
 import { RenderContext } from './RenderContext.js';
 import { RenderInterruptError } from './types.js';
-import { useAsync } from './useAsync.js';
 /**
  * This can be a global/singleton because render is synchronous.
  *
@@ -87,7 +85,7 @@ export class BlocksHandler {
         _BlocksHandler_instances.add(this);
         _BlocksHandler_root.set(this, void 0);
         _BlocksHandler_contextBuilder.set(this, new ContextBuilder());
-        _BlocksHandler_blocksTransformer.set(this, new BlocksTransformer());
+        _BlocksHandler_blocksTransformer.set(this, new BlocksTransformer(() => this._latestRenderContext?.devvitContext?.assets));
         this._latestRenderContext = null;
         console.log('BlocksHandler v1');
         __classPrivateFieldSet(this, _BlocksHandler_root, root, "f");
@@ -220,8 +218,8 @@ export class BlocksHandler {
                 console.error('Effects were mutated during rendering', context._effects, effectsCopy);
             }
             if (tags) {
-                blocks = await __classPrivateFieldGet(this, _BlocksHandler_blocksTransformer, "f").createBlocksElementOrThrow(tags);
-                blocks = await __classPrivateFieldGet(this, _BlocksHandler_blocksTransformer, "f").ensureRootBlock(blocks);
+                blocks = __classPrivateFieldGet(this, _BlocksHandler_blocksTransformer, "f").createBlocksElementOrThrow(tags);
+                blocks = __classPrivateFieldGet(this, _BlocksHandler_blocksTransformer, "f").ensureRootBlock(blocks);
             }
         }
         return {
@@ -357,28 +355,14 @@ async function _BlocksHandler_handleAsyncQueues(context, ...batch) {
             }
         }
         else {
-            const value = props[key];
+            // push value through the JSON parser to filter incompatible types
+            const value = JSON.parse(JSON.stringify(props[key]));
             if (value !== undefined && value !== null) {
-                reifiedProps[key] = key === 'url' ? __classPrivateFieldGet(this, _BlocksHandler_instances, "m", _BlocksHandler_resolveAsset).call(this, value) : value;
+                reifiedProps[key] = value;
             }
         }
     }
     return reifiedProps;
-}, _BlocksHandler_resolveAsset = function _BlocksHandler_resolveAsset(url) {
-    const resolvedUrl = globalThis.devvit?.config?.assets?.[url];
-    if (resolvedUrl) {
-        // no work to be done, the asset map from the bundle was available and had the mapping
-        return resolvedUrl;
-    }
-    // determine if the url can be used as-is
-    if (isRemoteUrl(url) || isAcceptableDataUrl(url)) {
-        return url;
-    }
-    // attempt to resolve the final URL with the AssetResolver plugin
-    const { data, loading } = useAsync(async () => {
-        return (await this._latestRenderContext?.devvitContext.assets.getURL(url)) ?? null;
-    });
-    return loading ? '' : data ?? '[missing]';
 };
 function isBlockElement(e) {
     return typeof e === 'object' && e != null && 'type' in e;

package/devvit/internals/blocks/handler/ContextBuilder.d.ts

@@ -1,5 +1,5 @@
 import type { Metadata, UIRequest } from '@devvit/protos';
-import { Devvit } from '../../../Devvit.js';
+import type { Devvit } from '../../../Devvit.js';
 import type { RenderContext } from './RenderContext.js';
 export declare class ContextBuilder {
     buildContext(renderContext: RenderContext, request: UIRequest, metadata: Metadata): Devvit.Context;

package/devvit/internals/blocks/handler/ContextBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContextBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/devvit/internals/blocks/handler/ContextBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAY1D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAiBxD,qBAAa,cAAc;IAClB,YAAY,CACjB,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,SAAS,EAClB,QAAQ,EAAE,QAAQ,GACjB,MAAM,CAAC,OAAO;CA2ClB"}
+{"version":3,"file":"ContextBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/devvit/internals/blocks/handler/ContextBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAY1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAiBxD,qBAAa,cAAc;IAClB,YAAY,CACjB,aAAa,EAAE,aAAa,EAC5B,OAAO,EAAE,SAAS,EAClB,QAAQ,EAAE,QAAQ,GACjB,MAAM,CAAC,OAAO;CA2ClB"}

package/devvit/internals/blocks/handler/ContextBuilder.js

@@ -8,7 +8,6 @@ import { RedditAPIClient } from '../../../../apis/reddit/RedditAPIClient.js';
 import { RedisClient } from '../../../../apis/redis/RedisClient.js';
 import { SchedulerClient } from '../../../../apis/scheduler/SchedulerClient.js';
 import { SettingsClient } from '../../../../apis/settings/SettingsClient.js';
-import { Devvit } from '../../../Devvit.js';
 import { getContextFromMetadata } from '../../context.js';
 import { UIClient } from './UIClient.js';
 import { useChannel } from './useChannel.js';
@@ -31,7 +30,7 @@ export class ContextBuilder {
         const settings = new SettingsClient(metadata);
         const ui = new UIClient(renderContext);
         const media = new MediaClient(metadata);
-        const assets = new AssetsClient(metadata, () => Devvit.assetsPlugin);
+        const assets = new AssetsClient();
         const realtime = new RealtimeClient(metadata);
         const cache = UnimplementedProxy;
         const apiClients = {

package/meta.json

@@ -11452,12 +11452,12 @@
       "format": "esm"
     },
     "src/apis/AssetsClient/AssetsClient.ts": {
-      "bytes": 3761,
+      "bytes": 2616,
       "imports": [
         {
-          "path": "../../devvit/Devvit.js",
+          "path": "src/devvit/Devvit.ts",
           "kind": "import-statement",
-          "external": true
+          "original": "../../devvit/Devvit.js"
         },
         {
           "path": "<runtime>",
@@ -11679,7 +11679,7 @@
       "format": "esm"
     },
     "src/apis/makeAPIClients.ts": {
-      "bytes": 3418,
+      "bytes": 3345,
       "imports": [
         {
           "path": "src/devvit/internals/blocks/useChannel.ts",
@@ -11701,11 +11701,6 @@
           "kind": "import-statement",
           "original": "../devvit/internals/blocks/useState.js"
         },
-        {
-          "path": "src/index.ts",
-          "kind": "import-statement",
-          "original": "../index.js"
-        },
         {
           "path": "src/apis/AssetsClient/AssetsClient.ts",
           "kind": "import-statement",
@@ -11837,11 +11832,6 @@
       ],
       "format": "esm"
     },
-    "../shared-types/dist/imageUtil.js": {
-      "bytes": 2722,
-      "imports": [],
-      "format": "esm"
-    },
     "src/apis/ui/helpers/getEffectsFromUIClient.ts": {
       "bytes": 368,
       "imports": [],
@@ -11869,7 +11859,7 @@
       "format": "esm"
     },
     "src/devvit/internals/blocks/BlocksTransformer.ts": {
-      "bytes": 27859,
+      "bytes": 28008,
       "imports": [
         {
           "path": "../protos/dist/index.js",
@@ -11885,12 +11875,17 @@
           "path": "src/devvit/internals/helpers/color.ts",
           "kind": "import-statement",
           "original": "../helpers/color.js"
+        },
+        {
+          "path": "<runtime>",
+          "kind": "import-statement",
+          "external": true
         }
       ],
       "format": "esm"
     },
     "src/devvit/internals/blocks/BlocksReconciler.ts": {
-      "bytes": 19632,
+      "bytes": 18195,
       "imports": [
         {
           "path": "../protos/dist/index.js",
@@ -11902,11 +11897,6 @@
           "kind": "import-statement",
           "original": "@devvit/shared-types/Header.js"
         },
-        {
-          "path": "../shared-types/dist/imageUtil.js",
-          "kind": "import-statement",
-          "original": "@devvit/shared-types/imageUtil.js"
-        },
         {
           "path": "src/apis/makeAPIClients.ts",
           "kind": "import-statement",
@@ -12401,7 +12391,7 @@
       "format": "esm"
     },
     "src/devvit/internals/blocks/handler/ContextBuilder.ts": {
-      "bytes": 3111,
+      "bytes": 3081,
       "imports": [
         {
           "path": "../shared-types/dist/Header.js",
@@ -12453,11 +12443,6 @@
           "kind": "import-statement",
           "original": "../../../../apis/settings/SettingsClient.js"
         },
-        {
-          "path": "src/devvit/Devvit.ts",
-          "kind": "import-statement",
-          "original": "../../../Devvit.js"
-        },
         {
           "path": "src/devvit/internals/context.ts",
           "kind": "import-statement",
@@ -12491,50 +12476,14 @@
       ],
       "format": "esm"
     },
-    "../shared-types/dist/CircuitBreaker.js": {
-      "bytes": 943,
-      "imports": [],
-      "format": "esm"
-    },
-    "src/devvit/internals/blocks/handler/useAsync.ts": {
-      "bytes": 4653,
-      "imports": [
-        {
-          "path": "src/devvit/internals/blocks/handler/BlocksHandler.ts",
-          "kind": "import-statement",
-          "original": "./BlocksHandler.js"
-        },
-        {
-          "path": "../../node_modules/lodash.isequal/index.js",
-          "kind": "import-statement",
-          "original": "lodash.isequal"
-        },
-        {
-          "path": "../shared-types/dist/CircuitBreaker.js",
-          "kind": "import-statement",
-          "original": "@devvit/shared-types/CircuitBreaker.js"
-        },
-        {
-          "path": "<runtime>",
-          "kind": "import-statement",
-          "external": true
-        }
-      ],
-      "format": "esm"
-    },
     "src/devvit/internals/blocks/handler/BlocksHandler.ts": {
-      "bytes": 16152,
+      "bytes": 15102,
       "imports": [
         {
           "path": "@devvit/protos",
           "kind": "import-statement",
           "external": true
         },
-        {
-          "path": "../shared-types/dist/imageUtil.js",
-          "kind": "import-statement",
-          "original": "@devvit/shared-types/imageUtil.js"
-        },
         {
           "path": "../../node_modules/lodash.isequal/index.js",
           "kind": "import-statement",
@@ -12560,11 +12509,6 @@
           "kind": "import-statement",
           "original": "./types.js"
         },
-        {
-          "path": "src/devvit/internals/blocks/handler/useAsync.ts",
-          "kind": "import-statement",
-          "original": "./useAsync.js"
-        },
         {
           "path": "<runtime>",
           "kind": "import-statement",
@@ -12600,7 +12544,7 @@
       "format": "esm"
     },
     "src/devvit/Devvit.ts": {
-      "bytes": 34309,
+      "bytes": 33892,
       "imports": [
         {
           "path": "../protos/dist/index.js",
@@ -13361,6 +13305,37 @@
       ],
       "format": "esm"
     },
+    "../shared-types/dist/CircuitBreaker.js": {
+      "bytes": 943,
+      "imports": [],
+      "format": "esm"
+    },
+    "src/devvit/internals/blocks/handler/useAsync.ts": {
+      "bytes": 4653,
+      "imports": [
+        {
+          "path": "src/devvit/internals/blocks/handler/BlocksHandler.ts",
+          "kind": "import-statement",
+          "original": "./BlocksHandler.js"
+        },
+        {
+          "path": "../../node_modules/lodash.isequal/index.js",
+          "kind": "import-statement",
+          "original": "lodash.isequal"
+        },
+        {
+          "path": "../shared-types/dist/CircuitBreaker.js",
+          "kind": "import-statement",
+          "original": "@devvit/shared-types/CircuitBreaker.js"
+        },
+        {
+          "path": "<runtime>",
+          "kind": "import-statement",
+          "external": true
+        }
+      ],
+      "format": "esm"
+    },
     "src/index.ts": {
       "bytes": 707,
       "imports": [
@@ -14099,7 +14074,7 @@
           "bytesInOutput": 3165
         },
         "../protos/dist/types/devvit/plugin/assetresolver/assetresolver.js": {
-          "bytesInOutput": 13679
+          "bytesInOutput": 12946
         },
         "../protos/dist/types/devvit/gateway/v1alpha/triggers.js": {
           "bytesInOutput": 9704
@@ -14333,10 +14308,10 @@
           "bytesInOutput": 1356
         },
         "src/apis/AssetsClient/AssetsClient.ts": {
-          "bytesInOutput": 2760
+          "bytesInOutput": 1873
         },
         "src/apis/key-value-storage/KeyValueStorage.ts": {
-          "bytesInOutput": 971
+          "bytesInOutput": 963
         },
         "src/apis/media/MediaClient.ts": {
           "bytesInOutput": 525
@@ -14366,10 +14341,10 @@
           "bytesInOutput": 146
         },
         "src/apis/realtime/RealtimeClient.ts": {
-          "bytesInOutput": 346
+          "bytesInOutput": 341
         },
         "src/apis/makeAPIClients.ts": {
-          "bytesInOutput": 2008
+          "bytesInOutput": 1973
         },
         "src/devvit/internals/context.ts": {
           "bytesInOutput": 711
@@ -14380,9 +14355,6 @@
         "src/devvit/internals/app-settings.ts": {
           "bytesInOutput": 614
         },
-        "../shared-types/dist/imageUtil.js": {
-          "bytesInOutput": 1773
-        },
         "src/apis/ui/helpers/getEffectsFromUIClient.ts": {
           "bytesInOutput": 69
         },
@@ -14396,10 +14368,10 @@
           "bytesInOutput": 5194
         },
         "src/devvit/internals/blocks/BlocksTransformer.ts": {
-          "bytesInOutput": 22491
+          "bytesInOutput": 22616
         },
         "src/devvit/internals/blocks/BlocksReconciler.ts": {
-          "bytesInOutput": 14788
+          "bytesInOutput": 14171
         },
         "src/devvit/internals/custom-post.ts": {
           "bytesInOutput": 697
@@ -14426,7 +14398,7 @@
           "bytesInOutput": 3085
         },
         "src/devvit/internals/blocks/handler/BlocksHandler.ts": {
-          "bytesInOutput": 13522
+          "bytesInOutput": 12588
         },
         "src/devvit/internals/blocks/handler/useForm.ts": {
           "bytesInOutput": 915
@@ -14450,19 +14422,13 @@
           "bytesInOutput": 2428
         },
         "src/devvit/internals/blocks/handler/ContextBuilder.ts": {
-          "bytesInOutput": 1558
-        },
-        "src/devvit/internals/blocks/handler/useAsync.ts": {
-          "bytesInOutput": 4060
-        },
-        "../shared-types/dist/CircuitBreaker.js": {
-          "bytesInOutput": 50
+          "bytesInOutput": 1523
         },
         "src/devvit/internals/ui-request-handler.ts": {
           "bytesInOutput": 618
         },
         "src/devvit/Devvit.ts": {
-          "bytesInOutput": 19374
+          "bytesInOutput": 19173
         },
         "src/apis/reddit/helpers/makeGettersEnumerable.ts": {
           "bytesInOutput": 344
@@ -14538,9 +14504,15 @@
         },
         "src/apis/ui/helpers/svg.ts": {
           "bytesInOutput": 370
+        },
+        "src/devvit/internals/blocks/handler/useAsync.ts": {
+          "bytesInOutput": 4060
+        },
+        "../shared-types/dist/CircuitBreaker.js": {
+          "bytesInOutput": 50
         }
       },
-      "bytes": 14961084
+      "bytes": 14942813
     }
   }
 }