@croct/plug 0.12.0 → 0.12.2

package/component.d.ts

@@ -9,7 +9,7 @@ type LatestComponentVersionMap = {
 export interface VersionedComponentMap extends LatestComponentVersionMap {
 }
 export type ComponentId = keyof VersionedComponentMap extends never ? string : keyof VersionedComponentMap;
-export type ComponentVersion<I extends ComponentId = ComponentId> = Version<VersionedComponentMap, I>;
+export type ComponentVersion<I extends ComponentId> = Version<VersionedComponentMap, I>;
 export type ComponentVersionId<I extends ComponentId = ComponentId> = CanonicalVersionId<I, VersionedComponentMap>;
 export type VersionedComponentId<I extends ComponentId = ComponentId> = VersionedId<I, VersionedComponentMap>;
 export type ComponentContent<I extends VersionedComponentId> = Versioned<I, VersionedComponentMap>;

package/constants.d.ts

@@ -2,4 +2,4 @@ export declare const CDN_URL = "https://cdn.croct.io/js/v1/lib/plug.js";
 export declare const PLAYGROUND_ORIGIN = "https://play.croct.com";
 export declare const PLAYGROUND_CONNECT_URL = "https://play.croct.com/connect.html";
 export declare const PREVIEW_WIDGET_ORIGIN = "https://cdn.croct.io";
-export declare const PREVIEW_WIDGET_URL = "https://cdn.croct.io/js/v1/lib/plug/widget-0.12.0.html";
+export declare const PREVIEW_WIDGET_URL = "https://cdn.croct.io/js/v1/lib/plug/widget-0.12.2.html";

package/constants.js

@@ -5,5 +5,5 @@ exports.CDN_URL = 'https://cdn.croct.io/js/v1/lib/plug.js';
 exports.PLAYGROUND_ORIGIN = 'https://play.croct.com';
 exports.PLAYGROUND_CONNECT_URL = 'https://play.croct.com/connect.html';
 exports.PREVIEW_WIDGET_ORIGIN = 'https://cdn.croct.io';
-exports.PREVIEW_WIDGET_URL = 'https://cdn.croct.io/js/v1/lib/plug/widget-0.12.0.html';
+exports.PREVIEW_WIDGET_URL = 'https://cdn.croct.io/js/v1/lib/plug/widget-0.12.2.html';
 //# sourceMappingURL=constants.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@croct/plug",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "A fully-featured devkit for building natively personalized applications.",
   "license": "MIT",
   "author": {

package/slot.d.ts

@@ -21,9 +21,9 @@ export interface VersionedSlotMap extends LatestSlotVersionMap {
  * which improves type inference when narrowing the type.
  */
 type Intersection<T, E> = T extends infer O ? O & E : never;
-type UnionContent = {
+type UnionContent<T = null> = {
     [K in ComponentVersionId]: Intersection<ComponentContent<K>, {
-        _component: K | null;
+        _component: K | T;
     }>;
 };
 type UnknownContent = UnionContent[ComponentVersionId] extends never ? (JsonObject & {
@@ -32,9 +32,9 @@ type UnknownContent = UnionContent[ComponentVersionId] extends never ? (JsonObje
 type VersionedContent<I extends VersionedSlotId> = Versioned<I, VersionedSlotMap, UnknownContent>;
 export type DynamicSlotId = any;
 export type SlotId = keyof VersionedSlotMap extends never ? string : keyof VersionedSlotMap;
-export type SlotVersion<I extends SlotId = SlotId> = Version<VersionedSlotMap, I>;
+export type SlotVersion<I extends SlotId> = Version<VersionedSlotMap, I>;
 export type SlotVersionId<I extends SlotId = SlotId> = CanonicalVersionId<I, VersionedSlotMap>;
 export type VersionedSlotId<I extends SlotId = SlotId> = VersionedId<I, VersionedSlotMap>;
-export type CompatibleSlotContent<T extends ComponentVersionId = ComponentVersionId> = UnionContent[T];
+export type CompatibleSlotContent<T extends ComponentVersionId = ComponentVersionId> = UnionContent<never>[T];
 export type SlotContent<I extends VersionedSlotId = VersionedSlotId, C extends JsonObject = JsonObject> = JsonObject extends C ? (string extends I ? UnknownContent : VersionedContent<I>) : C;
 export {};

package/src/component.ts

@@ -10,7 +10,7 @@ export interface VersionedComponentMap extends LatestComponentVersionMap {
 
 export type ComponentId = keyof VersionedComponentMap extends never ? string : keyof VersionedComponentMap;
 
-export type ComponentVersion<I extends ComponentId = ComponentId> = Version<VersionedComponentMap, I>;
+export type ComponentVersion<I extends ComponentId> = Version<VersionedComponentMap, I>;
 
 export type ComponentVersionId<I extends ComponentId = ComponentId> = CanonicalVersionId<I, VersionedComponentMap>;
 

package/src/slot.ts

@@ -22,8 +22,8 @@ export interface VersionedSlotMap extends LatestSlotVersionMap {
  */
 type Intersection<T, E> = T extends infer O ? O & E : never;
 
-type UnionContent = {
-    [K in ComponentVersionId]: Intersection<ComponentContent<K>, {_component: K | null}>;
+type UnionContent<T = null> = {
+    [K in ComponentVersionId]: Intersection<ComponentContent<K>, {_component: K | T}>;
 };
 
 type UnknownContent = UnionContent[ComponentVersionId] extends never
@@ -36,13 +36,13 @@ export type DynamicSlotId = any;
 
 export type SlotId = keyof VersionedSlotMap extends never ? string : keyof VersionedSlotMap;
 
-export type SlotVersion<I extends SlotId = SlotId> = Version<VersionedSlotMap, I>;
+export type SlotVersion<I extends SlotId> = Version<VersionedSlotMap, I>;
 
 export type SlotVersionId<I extends SlotId = SlotId> = CanonicalVersionId<I, VersionedSlotMap>;
 
 export type VersionedSlotId<I extends SlotId = SlotId> = VersionedId<I, VersionedSlotMap>;
 
-export type CompatibleSlotContent<T extends ComponentVersionId = ComponentVersionId> = UnionContent[T];
+export type CompatibleSlotContent<T extends ComponentVersionId = ComponentVersionId> = UnionContent<never>[T];
 
 export type SlotContent<I extends VersionedSlotId = VersionedSlotId, C extends JsonObject = JsonObject> =
     JsonObject extends C ? (string extends I ? UnknownContent : VersionedContent<I>) : C;

package/src/versioning.ts

@@ -2,10 +2,6 @@ import {JsonObject} from '@croct/json';
 
 export type LatestAlias = 'latest';
 
-export type ExtractVersion<I extends string> = I extends `${string}@${infer V}`
-    ? (LatestAlias extends V ? LatestAlias : (V extends `${number}` ? V : never))
-    : LatestAlias;
-
 export type CanonicalVersionId<I extends string, M> = {
     [K in I]: `${K}@${Extract<Version<M, K>, `${number}`>}`
 }[I];
@@ -17,13 +13,26 @@ type CastString<T extends string> = T extends `${infer V}` ? V : string;
 
 export type VersionedId<I extends string, M> = CastString<I> | {[K in I]: `${K}@${Version<M, K> & string}`}[I];
 
-export type ExtractId<I extends string> = I extends `${infer V}@${string}` ? V : CastString<I>;
-
 export type Version<M, I extends string> = LatestAlias | (I extends keyof M ? keyof M[I] : never);
 
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
+
+type Expand<T> = {[K in keyof T]: T[K]};
+
+type FlattenVersionMap<T> = Expand<
+    UnionToIntersection<
+        {
+            [K in Extract<keyof T, string>]: {
+                [K2 in Extract<keyof T[K], string> as (`${K}@${K2}` | (LatestAlias extends K2 ? K : never))]: T[K][K2];
+            }
+        }[Extract<keyof T, string>]
+    >
+>;
+
 export type Versioned<I extends string, M, C extends JsonObject = JsonObject> =
-    ExtractId<I> extends keyof M
-        ? ExtractVersion<I> extends keyof M[ExtractId<I>]
-            ? M[ExtractId<I>][ExtractVersion<I>]
+    // Ensure T is string
+    I extends `${infer K}`
+        ? K extends keyof FlattenVersionMap<M>
+            ? FlattenVersionMap<M>[K]
             : C
         : C;

package/versioning.d.ts

@@ -1,6 +1,5 @@
 import { JsonObject } from '@croct/json';
 export type LatestAlias = 'latest';
-export type ExtractVersion<I extends string> = I extends `${string}@${infer V}` ? (LatestAlias extends V ? LatestAlias : (V extends `${number}` ? V : never)) : LatestAlias;
 export type CanonicalVersionId<I extends string, M> = {
     [K in I]: `${K}@${Extract<Version<M, K>, `${number}`>}`;
 }[I];
@@ -11,7 +10,15 @@ type CastString<T extends string> = T extends `${infer V}` ? V : string;
 export type VersionedId<I extends string, M> = CastString<I> | {
     [K in I]: `${K}@${Version<M, K> & string}`;
 }[I];
-export type ExtractId<I extends string> = I extends `${infer V}@${string}` ? V : CastString<I>;
 export type Version<M, I extends string> = LatestAlias | (I extends keyof M ? keyof M[I] : never);
-export type Versioned<I extends string, M, C extends JsonObject = JsonObject> = ExtractId<I> extends keyof M ? ExtractVersion<I> extends keyof M[ExtractId<I>] ? M[ExtractId<I>][ExtractVersion<I>] : C : C;
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
+type Expand<T> = {
+    [K in keyof T]: T[K];
+};
+type FlattenVersionMap<T> = Expand<UnionToIntersection<{
+    [K in Extract<keyof T, string>]: {
+        [K2 in Extract<keyof T[K], string> as (`${K}@${K2}` | (LatestAlias extends K2 ? K : never))]: T[K][K2];
+    };
+}[Extract<keyof T, string>]>>;
+export type Versioned<I extends string, M, C extends JsonObject = JsonObject> = I extends `${infer K}` ? K extends keyof FlattenVersionMap<M> ? FlattenVersionMap<M>[K] : C : C;
 export {};